diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 53c925be7b..e723f37347 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -78,34 +78,34 @@ elif [[ "$BUILD_FLAVOR" == "ffmpeg-cross-compile-win64" ]]; then # =========================== elif [[ "$BUILD_FLAVOR" == "chromium-win64" ]]; then BROWSER_NAME="chromium" - EXTRA_BUILD_ARGS="--compile-win64" + EXTRA_BUILD_ARGS="--compile-win64 --full" EXTRA_ARCHIVE_ARGS="--compile-win64" EXPECTED_HOST_OS="MINGW" BUILD_BLOB_NAME="chromium-win64.zip" elif [[ "$BUILD_FLAVOR" == "chromium-mac" ]]; then BROWSER_NAME="chromium" - EXTRA_BUILD_ARGS="--compile-mac" + EXTRA_BUILD_ARGS="--compile-mac --full" EXTRA_ARCHIVE_ARGS="--compile-mac" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="10.15" BUILD_BLOB_NAME="chromium-mac.zip" elif [[ "$BUILD_FLAVOR" == "chromium-mac-arm64" ]]; then BROWSER_NAME="chromium" - EXTRA_BUILD_ARGS="--compile-mac-arm64" + EXTRA_BUILD_ARGS="--compile-mac-arm64 --full" EXTRA_ARCHIVE_ARGS="--compile-mac-arm64" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="10.15" BUILD_BLOB_NAME="chromium-mac-arm64.zip" elif [[ "$BUILD_FLAVOR" == "chromium-linux" ]]; then BROWSER_NAME="chromium" - EXTRA_BUILD_ARGS="--compile-linux" + EXTRA_BUILD_ARGS="--compile-linux --full" EXTRA_ARCHIVE_ARGS="--compile-linux" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="18.04" BUILD_BLOB_NAME="chromium-linux.zip" elif [[ "$BUILD_FLAVOR" == "chromium-linux-arm64" ]]; then BROWSER_NAME="chromium" - EXTRA_BUILD_ARGS="--compile-linux-arm64" + EXTRA_BUILD_ARGS="--compile-linux-arm64 --full" EXTRA_ARCHIVE_ARGS="--compile-linux-arm64" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="20.04" @@ -117,7 +117,7 @@ elif [[ "$BUILD_FLAVOR" == "chromium-linux-arm64" ]]; then elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-win64" ]]; then BROWSER_NAME="chromium" BROWSER_DISPLAY_NAME="chromium-with-symbols" - EXTRA_BUILD_ARGS="--compile-win64 --symbols" + EXTRA_BUILD_ARGS="--compile-win64 --symbols --full" EXTRA_ARCHIVE_ARGS="--compile-win64" EXPECTED_HOST_OS="MINGW" BUILD_BLOB_NAME="chromium-with-symbols-win64.zip" @@ -125,7 +125,7 @@ elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-win64" ]]; then elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-mac" ]]; then BROWSER_NAME="chromium" BROWSER_DISPLAY_NAME="chromium-with-symbols" - EXTRA_BUILD_ARGS="--compile-mac --symbols" + EXTRA_BUILD_ARGS="--compile-mac --symbols --full" EXTRA_ARCHIVE_ARGS="--compile-mac" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="10.15" @@ -134,7 +134,7 @@ elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-mac" ]]; then elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-mac-arm64" ]]; then BROWSER_NAME="chromium" BROWSER_DISPLAY_NAME="chromium-with-symbols" - EXTRA_BUILD_ARGS="--compile-mac-arm64 --symbols" + EXTRA_BUILD_ARGS="--compile-mac-arm64 --symbols --full" EXTRA_ARCHIVE_ARGS="--compile-mac-arm64" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="10.15" @@ -143,7 +143,7 @@ elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-mac-arm64" ]]; then elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-linux" ]]; then BROWSER_NAME="chromium" BROWSER_DISPLAY_NAME="chromium-with-symbols" - EXTRA_BUILD_ARGS="--compile-linux --symbols" + EXTRA_BUILD_ARGS="--compile-linux --symbols --full" EXTRA_ARCHIVE_ARGS="--compile-linux" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="18.04" @@ -152,7 +152,7 @@ elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-linux" ]]; then elif [[ "$BUILD_FLAVOR" == "chromium-with-symbols-linux-arm64" ]]; then BROWSER_NAME="chromium" BROWSER_DISPLAY_NAME="chromium-with-symbols-arm64" - EXTRA_BUILD_ARGS="--compile-linux-arm64 --symbols" + EXTRA_BUILD_ARGS="--compile-linux-arm64 --symbols --full" EXTRA_ARCHIVE_ARGS="--compile-linux-arm64" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="20.04" diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh index 9c0f526224..d97ae1950c 100755 --- a/browser_patches/chromium/build.sh +++ b/browser_patches/chromium/build.sh @@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT cd "$(dirname "$0")" USAGE=$(cat< ./out/Default/args.gn echo "dcheck_always_on = false" >> ./out/Default/args.gn - if [[ $2 == "--symbols" ]]; then + if [[ $2 == "--symbols" || $3 == "--symbols" ]]; then echo "symbol_level = 1" >> ./out/Default/args.gn else echo "symbol_level = 0" >> ./out/Default/args.gn @@ -84,9 +84,14 @@ compile_chromium() { cat ./out/Default/args.gn echo "===== ======= =====" - if [[ $1 == "--compile-linux-arm64" ]]; then - # Install sysroot image, see https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/linux/chromium_arm.md - ./build/linux/sysroot_scripts/install-sysroot.py --arch=arm + if [[ $2 == "--full" || $3 == "--full" ]]; then + if [[ $(uname) == "--compile-linux" ]]; then + ./build/install-build-deps.sh + elif [[ $1 == "--compile-linux-arm64" ]]; then + ./build/install-build-deps.sh --arm + # Install sysroot image, see https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/linux/chromium_arm.md + ./build/linux/sysroot_scripts/install-sysroot.py --arch=arm + fi fi if [[ $1 == "--compile-win"* ]]; then diff --git a/browser_patches/prepare_checkout.sh b/browser_patches/prepare_checkout.sh index 0d1df8e267..3538851212 100755 --- a/browser_patches/prepare_checkout.sh +++ b/browser_patches/prepare_checkout.sh @@ -52,7 +52,7 @@ function prepare_chromium_checkout { fetch --nohooks chromium cd src if [[ $(uname) == "Linux" ]]; then - ./build/install-build-deps.sh --arm + ./build/install-build-deps.sh fi gclient runhooks fi