From 4dacf8bfd05e1d4d16fd5579e3245c814be3300b Mon Sep 17 00:00:00 2001 From: David Major Date: Wed, 1 Apr 2020 14:22:35 +0000 Subject: [PATCH] Bug 1626340 - Fix some mozconfigs where mozconfig.common.override is not at the end r=rstewart mozconfig.common.override is supposed to be a way for try pushes to change any options that may have been previously set. To do this effectively, it needs to be the last thing in the mozconfig. Differential Revision: https://phabricator.services.mozilla.com/D69045 --HG-- extra : moz-landing-system : lando --- browser/config/mozconfigs/linux64/tup | 2 +- browser/config/mozconfigs/win32/debug-static-analysis | 2 +- browser/config/mozconfigs/win64/code-coverage | 2 +- browser/config/mozconfigs/win64/debug-searchfox | 2 +- .../mozconfigs/android-api-16-gradle-dependencies/nightly | 5 +++-- .../config/mozconfigs/android-api-16/nightly-android-lints | 5 +++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/browser/config/mozconfigs/linux64/tup b/browser/config/mozconfigs/linux64/tup index 08acbee48dc2..22ab99be7025 100644 --- a/browser/config/mozconfigs/linux64/tup +++ b/browser/config/mozconfigs/linux64/tup @@ -7,10 +7,10 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} export TUP=${MOZ_FETCHES_DIR}/tup/tup . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt" -. "$topsrcdir/build/mozconfig.common.override" ac_add_options --enable-build-backends=Tup unset ENABLE_CLANG_PLUGIN # To enable the option to upload the tup database, uncomment the line below # ac_add_options --upload-tup-db +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win32/debug-static-analysis b/browser/config/mozconfigs/win32/debug-static-analysis index 40965bdf9f08..ad046f27e265 100644 --- a/browser/config/mozconfigs/win32/debug-static-analysis +++ b/browser/config/mozconfigs/win32/debug-static-analysis @@ -8,5 +8,5 @@ ac_add_options --enable-debug ac_add_options --enable-clang-plugin -. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.clang-cl" +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/code-coverage b/browser/config/mozconfigs/win64/code-coverage index 4662efba1afe..21c088b566d4 100644 --- a/browser/config/mozconfigs/win64/code-coverage +++ b/browser/config/mozconfigs/win64/code-coverage @@ -24,5 +24,5 @@ fi export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off" -. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.clang-cl" +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/debug-searchfox b/browser/config/mozconfigs/win64/debug-searchfox index c08544110bf7..56d44b81a1f8 100644 --- a/browser/config/mozconfigs/win64/debug-searchfox +++ b/browser/config/mozconfigs/win64/debug-searchfox @@ -15,5 +15,5 @@ export RUSTFLAGS="-Zsave-analysis" ac_add_options --enable-clang-plugin ac_add_options --enable-mozsearch-plugin -. "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.clang-cl" +. "$topsrcdir/build/mozconfig.common.override" diff --git a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly index be52f9d4fb8d..292305148c13 100644 --- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly +++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly @@ -35,8 +35,7 @@ ac_add_options --with-branding=mobile/android/branding/nightly export MOZILLA_OFFICIAL=1 -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" - +# mozconfigs/common.override would be here, but it needs to be last in the file. # End ../android-api-16-frontend/nightly. # Disable Keyfile Loading (and checks) since dependency fetching doesn't need these keys. @@ -44,3 +43,5 @@ export MOZILLA_OFFICIAL=1 ac_add_options --without-mozilla-api-keyfile ac_add_options --without-google-location-service-api-keyfile ac_add_options --without-google-safebrowsing-api-keyfile + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-16/nightly-android-lints b/mobile/android/config/mozconfigs/android-api-16/nightly-android-lints index 72957188a64b..f313e929e32c 100644 --- a/mobile/android/config/mozconfigs/android-api-16/nightly-android-lints +++ b/mobile/android/config/mozconfigs/android-api-16/nightly-android-lints @@ -30,8 +30,7 @@ ac_add_options --with-branding=mobile/android/branding/nightly export MOZILLA_OFFICIAL=1 -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" - +# mozconfigs/common.override would be here, but it needs to be last in the file. # End ../android-api-16/nightly. # Disable Keyfile Loading (and checks) since. @@ -39,3 +38,5 @@ export MOZILLA_OFFICIAL=1 ac_add_options --without-mozilla-api-keyfile ac_add_options --without-google-location-service-api-keyfile ac_add_options --without-google-safebrowsing-api-keyfile + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override"