fix build scripts for new autoninja

This commit is contained in:
Alexander Frick 2023-07-03 04:05:27 -05:00
parent b9661749a3
commit 2d56f30834
6 changed files with 21 additions and 16 deletions

View file

@ -43,9 +43,10 @@ printf "${CYA}\n" &&
export NINJA_SUMMARIZE_BUILD=1 &&
export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
autoninja -C ${CR_SRC_DIR}/out/thorium chrome chrome_sandbox chromedriver clear_key_cdm thorium_shell -j$@ &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium chrome chrome_sandbox chromedriver clear_key_cdm thorium_shell -j$@ &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed! ${YEL}${bold}You can now run \'./package.sh\' to build installation packages.\n" &&
tput sgr0 &&

View file

@ -46,10 +46,10 @@ buildARM32 () {
# Build Thorium for ARM32 and System WebView
export NINJA_SUMMARIZE_BUILD=1 &&
autoninja -C ${CR_SRC_DIR}/out/thorium chrome_public_apk content_shell_apk system_webview_apk -j$@ &&
mv ${CR_SRC_DIR}/out/thorium/apks/ChromePublic.apk ${CR_SRC_DIR}/out/thorium/apks/Thorium_Public_arm32.apk &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium chrome_public_apk content_shell_apk system_webview_apk -j$@ &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apk(s) to your device or use ADB to install it.\n" &&
printf "${GRE}${bold}They are located in \'//chromium/src/out/thorium/apks/\'\n" &&
@ -62,11 +62,11 @@ esac
# Build Thorium for ARM64
export NINJA_SUMMARIZE_BUILD=1 &&
export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
autoninja -C ${CR_SRC_DIR}/out/thorium content_shell_apk chrome_public_apk -j$@ &&
mv ${CR_SRC_DIR}/out/thorium/apks/ChromePublic.apk ${CR_SRC_DIR}/out/thorium/apks/Thorium_Public_arm64.apk &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium content_shell_apk chrome_public_apk -j$@ &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apk(s) to your device or use ADB to install it.\n" &&
printf "${GRE}${bold}They are located in \'//chromium/src/out/thorium/apks/\'\n" &&

View file

@ -36,9 +36,10 @@ buildShell () {
# Build Thorium
export NINJA_SUMMARIZE_BUILD=1 &&
autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver thorium_shell -j$@ &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium chrome chromedriver thorium_shell -j$@ &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can now run \'./build_dmg.sh\', and copy the Thorium Shell.app out.\n" &&
tput sgr0
@ -64,9 +65,10 @@ printf "${CYA}\n" &&
export NINJA_SUMMARIZE_BUILD=1 &&
export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver -j$@ &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium chrome chromedriver -j$@ &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can now run \'./build_dmg.sh\'\n" &&

View file

@ -43,11 +43,12 @@ printf "${GRE}\n" &&
export NINJA_SUMMARIZE_BUILD=1 &&
export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver clear_key_cdm thorium_shell setup mini_installer -j$@ &&
cd ${CR_SRC_DIR} &&
autoninja -C out/thorium chrome chromedriver clear_key_cdm thorium_shell setup mini_installer -j$@ &&
mv -v -f ${CR_SRC_DIR}/out/thorium/mini_installer.exe ${CR_SRC_DIR}/out/thorium/thorium_mini_installer.exe &&
cat logos/thorium_logo_ascii_art.txt &&
cat ~/thorium/logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}Installer at \'//out/thorium/thorium_mini_installer.exe\'\n" &&
tput sgr0 &&

View file

@ -8,8 +8,8 @@
#
thorium.exe: %(ChromeDir)s\
chrome_proxy.exe: %(ChromeDir)s\
# initial_preferences file, to show Thorium welcome page on first start
initial_preferences: %(ChromeDir)s\
# initial_preferences file, to show Thorium welcome page on first start
#
# Chrome version dir assembly manifest.
# The name of this file must match the name of the version dir, so we cannot
@ -36,6 +36,7 @@ content_shell.pak: %(VersionDir)s\
d3dcompiler_47.dll: %(VersionDir)s\
eventlog_provider.dll: %(VersionDir)s\
ffmpeg.dll: %(VersionDir)s\
initial_preferences: %(VersionDir)s\
icudtl.dat: %(VersionDir)s\
libEGL.dll: %(VersionDir)s\
libGLESv2.dll: %(VersionDir)s\

View file

@ -79,4 +79,4 @@ use_text_section_splitting = true
use_thin_lto = true
thin_lto_enable_optimizations = true
chrome_pgo_phase = 2
pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-5615-1680716428-8e5dbcb72fb3956bfc18e684258d4a2c2c6a5be2.profdata"
pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-win64-5735-1685467728-4fba4ca793cea943cc07472ae72ee50648b02fe3.profdata"