Bug 1283898 - Make tooltool rust available in all automation. r=gps
authorRalph Giles <giles@mozilla.com>
Wed, 30 Nov 2016 16:10:33 -0800
changeset 371056 71ca80cc382f4d193ffc35adf777de4095c4d3d5
parent 371055 71bc383bef2303cbeb1d1b62af2c602d916a210d
child 371057 b39b3fe699dcfad861adaf9ee9fa1f63f9855d04
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1283898
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1283898 - Make tooltool rust available in all automation. r=gps Include mozconfig.rust in the common mozconfig so all jobs will have the same rust config. Automation mozconfigs all inherit from mozconfig.common, so we can include mozconfig.rust there and not need it anywhere else. Remove --enable-rust from mozconfig.rust now that it's the default. We only need the RUSTC and CARGO path variables so jobs can find the toolchain installed from the tooltool manifest. Also some automation jobs reject the configure option if we set it unconditionally. The --enable-rpath comment is no longer necessary; rust has been consistently built this way for some time. MozReview-Commit-ID: 2IeIIIinnPL
browser/config/mozconfigs/linux32/beta
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/linux32/nightly
browser/config/mozconfigs/linux32/release
browser/config/mozconfigs/linux64/beta
browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux64/nightly
browser/config/mozconfigs/linux64/release
browser/config/mozconfigs/macosx-universal/beta
browser/config/mozconfigs/macosx-universal/nightly
browser/config/mozconfigs/macosx-universal/release
browser/config/mozconfigs/macosx64/beta
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/nightly
browser/config/mozconfigs/macosx64/opt-static-analysis
browser/config/mozconfigs/macosx64/release
browser/config/mozconfigs/win32/beta
browser/config/mozconfigs/win32/clang
browser/config/mozconfigs/win32/clang-debug
browser/config/mozconfigs/win32/debug
browser/config/mozconfigs/win32/debug-static-analysis
browser/config/mozconfigs/win32/nightly
browser/config/mozconfigs/win32/release
browser/config/mozconfigs/win64/beta
browser/config/mozconfigs/win64/clang
browser/config/mozconfigs/win64/clang-debug
browser/config/mozconfigs/win64/debug
browser/config/mozconfigs/win64/nightly
browser/config/mozconfigs/win64/release
build/mozconfig.common
build/mozconfig.rust
mobile/android/config/mozconfigs/android-api-15-gradle/nightly
mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
mobile/android/config/mozconfigs/android-api-15/debug
mobile/android/config/mozconfigs/android-api-15/l10n-nightly
mobile/android/config/mozconfigs/android-api-15/l10n-release
mobile/android/config/mozconfigs/android-api-15/nightly
mobile/android/config/mozconfigs/android-api-15/nightly-artifact
mobile/android/config/mozconfigs/android-api-15/release
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-release
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android-x86/release
mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
--- a/browser/config/mozconfigs/linux32/beta
+++ b/browser/config/mozconfigs/linux32/beta
@@ -6,10 +6,9 @@ fi
 
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -14,11 +14,10 @@ export MOZ_TELEMETRY_REPORTING=1
 
 #Use ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux32/nightly
+++ b/browser/config/mozconfigs/linux32/nightly
@@ -5,11 +5,10 @@ ac_add_options --enable-verify-mar
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux32/release
+++ b/browser/config/mozconfigs/linux32/release
@@ -13,10 +13,9 @@ ac_add_options --enable-official-brandin
 ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/beta
+++ b/browser/config/mozconfigs/linux64/beta
@@ -6,10 +6,9 @@ fi
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -12,11 +12,10 @@ export MOZILLA_OFFICIAL=1
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@@ -5,11 +5,10 @@ ac_add_options --enable-verify-mar
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux64/release
+++ b/browser/config/mozconfigs/linux64/release
@@ -13,10 +13,9 @@ ac_add_options --enable-official-brandin
 ac_add_options --enable-verify-mar
 
 mk_add_options MOZ_PGO=1
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx-universal/beta
+++ b/browser/config/mozconfigs/macosx-universal/beta
@@ -5,11 +5,10 @@ if [ -n "$ENABLE_RELEASE_PROMOTION" ]; t
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 
 . "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -11,11 +11,10 @@ if test `uname -s` != Linux; then
 fi
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx-universal/release
+++ b/browser/config/mozconfigs/macosx-universal/release
@@ -11,11 +11,10 @@ fi
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/beta
+++ b/browser/config/mozconfigs/macosx64/beta
@@ -5,11 +5,10 @@ if [ -n "$ENABLE_RELEASE_PROMOTION" ]; t
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
 
 . "$topsrcdir/browser/config/mozconfigs/macosx64/common-opt"
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -14,11 +14,10 @@ if test "${MOZ_UPDATE_CHANNEL}" = "night
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/browser/config/mozconfigs/macosx64/nightly
@@ -11,11 +11,10 @@ if test `uname -s` != Linux; then
 fi
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/opt-static-analysis
+++ b/browser/config/mozconfigs/macosx64/opt-static-analysis
@@ -5,12 +5,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-dmd
 
 ac_add_options --enable-clang-plugin
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 
--- a/browser/config/mozconfigs/macosx64/release
+++ b/browser/config/mozconfigs/macosx64/release
@@ -11,11 +11,10 @@ fi
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win32/beta
+++ b/browser/config/mozconfigs/win32/beta
@@ -8,11 +8,9 @@ fi
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/clang
+++ b/browser/config/mozconfigs/win32/clang
@@ -7,13 +7,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-optimize
 
 #Work to make the clang-plugin work on Windows is ongoing in bug 1316545.
 #ac_add_options --enable-clang-plugin
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 . "$topsrcdir/build/mozconfig.clang-cl"
--- a/browser/config/mozconfigs/win32/clang-debug
+++ b/browser/config/mozconfigs/win32/clang-debug
@@ -8,13 +8,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 ac_add_options --enable-optimize
 ac_add_options --enable-debug
 
 #Work to make the clang-plugin work on Windows is ongoing in bug 1316545.
 #ac_add_options --enable-clang-plugin
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 . "$topsrcdir/build/mozconfig.clang-cl"
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -16,12 +16,10 @@ export MOZ_TELEMETRY_REPORTING=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win32/debug-static-analysis
+++ b/browser/config/mozconfigs/win32/debug-static-analysis
@@ -7,13 +7,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 
 ac_add_options --enable-clang-plugin
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 . "$topsrcdir/build/mozconfig.clang-cl"
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -1,12 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 ac_add_options --enable-profiling
 ac_add_options --enable-verify-mar
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -14,11 +14,9 @@ mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/beta
+++ b/browser/config/mozconfigs/win64/beta
@@ -9,11 +9,9 @@ fi
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/clang
+++ b/browser/config/mozconfigs/win64/clang
@@ -9,13 +9,11 @@ ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-optimize
 
 #Work to make the clang-plugin work on Windows is ongoing in bug 1316545.
 #ac_add_options --enable-clang-plugin
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 . "$topsrcdir/build/mozconfig.clang-cl"
--- a/browser/config/mozconfigs/win64/clang-debug
+++ b/browser/config/mozconfigs/win64/clang-debug
@@ -10,13 +10,11 @@ ac_add_options --host=x86_64-pc-mingw32
 ac_add_options --enable-optimize
 ac_add_options --enable-debug
 
 #Work to make the clang-plugin work on Windows is ongoing in bug 1316545.
 #ac_add_options --enable-clang-plugin
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
 . "$topsrcdir/build/mozconfig.clang-cl"
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -18,12 +18,10 @@ export MOZ_TELEMETRY_REPORTING=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -2,12 +2,10 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 ac_add_options --enable-profiling
 ac_add_options --enable-verify-mar
 
 ac_add_options --with-branding=browser/branding/nightly
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win64/release
+++ b/browser/config/mozconfigs/win64/release
@@ -15,11 +15,9 @@ mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -19,8 +19,9 @@ ac_add_options --enable-release
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
 
 ac_add_options --enable-js-shell
 
 . "$topsrcdir/build/mozconfig.automation"
+. "$topsrcdir/build/mozconfig.rust"
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,10 +1,5 @@
 # Options to enable rust in automation builds.
 
 # Tell configure to use the tooltool rustc.
-# Assume this is compiled with --enable-rpath so we don't
-# have to set LD_LIBRARY_PATH.
 RUSTC="$topsrcdir/rustc/bin/rustc"
 CARGO="$topsrcdir/rustc/bin/cargo"
-
-# Enable rust in the build.
-ac_add_options --enable-rust
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
@@ -1,9 +1,8 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
 ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
@@ -1,16 +1,15 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15-gradle/nightly"
 
 unset CC
 unset CXX
 unset HOST_CC
 unset HOST_CXX
 
--- a/mobile/android/config/mozconfigs/android-api-15/debug
+++ b/mobile/android/config/mozconfigs/android-api-15/debug
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # Global options
 ac_add_options --enable-debug
 ENABLE_MARIONETTE=1
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
 # Global options
 ac_add_options --disable-tests
 
 # Android
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-release
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-release
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # L10n
 ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Android
--- a/mobile/android/config/mozconfigs/android-api-15/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 ac_add_options --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
@@ -1,16 +1,15 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
 unset CC
 unset CXX
 unset HOST_CC
 unset HOST_CXX
 
--- a/mobile/android/config/mozconfigs/android-api-15/release
+++ b/mobile/android/config/mozconfigs/android-api-15/release
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/beta
 
 ac_add_options --enable-updater
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # Global options
 ac_add_options --enable-debug
 
 # Android
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=15
 
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
 # Global options
 ac_add_options --disable-tests
 
 # Android
--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # L10n
 ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Android
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=15
 
 ac_add_options --enable-profiling
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ b/mobile/android/config/mozconfigs/android-x86/release
@@ -1,10 +1,9 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 # Android
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=15
 
 ac_add_options --enable-updater
 
 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
+++ b/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
@@ -1,11 +1,10 @@
 # currently a copy of mobile/android/config/mozconfigs/android-api-15/nightly
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-. "$topsrcdir/build/mozconfig.rust"
 
 ac_add_options --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly