Bug 1426555 - Use mozconfig.no-compile in non-compiling android jobs. r?build draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 21 Dec 2017 09:54:20 +0900
changeset 713852 100545bb0a2b50b629825899df30917aea83fb9c
parent 713851 0ff43265dc14c089c0551419f0986d31979985ce
child 713853 632cb70705ae211ad263b35c05fa137589970492
push id93779
push userbmo:mh+mozilla@glandium.org
push dateThu, 21 Dec 2017 03:02:50 +0000
reviewersbuild
bugs1426555
milestone59.0a1
Bug 1426555 - Use mozconfig.no-compile in non-compiling android jobs. r?build Instead of manually unsetting a few variables and adding --disable-compile-environment, we can rely on the mozconfig that does all that.
mobile/android/config/mozconfigs/android-api-16-frontend/nightly
mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
--- a/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
@@ -8,22 +8,18 @@ MOZ_AUTOMATION_UPDATE_PACKAGING=0
 MOZ_AUTOMATION_UPLOAD=0
 MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
+. "$topsrcdir/build/mozconfig.no-compile"
 
-ac_add_options --disable-compile-environment
 ac_add_options --disable-tests
 
 # From here on, like ../android-api-16/nightly.
 
 ac_add_options --enable-profiling
 
 # Android
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
--- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
@@ -15,21 +15,17 @@ NO_NDK=1
 
 # We want to download Gradle.
 ac_add_options --with-gradle
 # We want to use (and populate!) the local Nexus repositories.
 export GRADLE_MAVEN_REPOSITORIES="http://localhost:8081/nexus/content/repositories/jcenter/","http://localhost:8081/nexus/content/repositories/google/"
 
 # From here on, just like ../android-api-16-frontend/nightly.
 
-ac_add_options --disable-compile-environment
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --disable-tests
 
 ac_add_options --enable-profiling
 
 # Android
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will