Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 15:02:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1626340 - Fix some mozconfigs where mozconfig.common.override is not at the end r=rstewart

Browse Source 
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
This commit is contained in:
David Major 2020-04-01 14:22:35 +00:00
parent 2e7e4c38ec
commit 4dacf8bfd0
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/config/mozconfigs/linux64/tup
View File

@ -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"

2
browser/config/mozconfigs/win32/debug-static-analysis
View File

@ -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"

2
browser/config/mozconfigs/win64/code-coverage
View File

@ -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"

2
browser/config/mozconfigs/win64/debug-searchfox
View File

@ -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"

5
mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
View File

@ -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"

5
mobile/android/config/mozconfigs/android-api-16/nightly-android-lints
View File

@ -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"