No bug - Use l10n tooltool manifest for osx repacks and disable compile environment for android l10n. r=Callek,a=bustage
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 27 Jul 2017 21:48:06 +0900
changeset 422486 0379882c11f6d72f11d265036fc815e73b9ef5b2
parent 422485 36f95aeb4c77f7cf3b3366583008cd6e4b6b1dba
child 422515 0aab101edb50b91aa1c16b372fab382a60137482
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, bustage
bugs1384418, 1384419, 1384420
milestone56.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
No bug - Use l10n tooltool manifest for osx repacks and disable compile environment for android l10n. r=Callek,a=bustage This should fix the repacks bustage from bugs 1384418, 1384419 and 1384420.
mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
mobile/android/config/mozconfigs/android-api-15/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-nightly
testing/mozharness/configs/repackage/osx_signed.py
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -1,13 +1,17 @@
+NO_NDK=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+. "$topsrcdir/build/mozconfig.no-compile"
+
 # Global options
 ac_add_options --disable-tests
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 ac_add_options --enable-updater
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
@@ -1,13 +1,17 @@
+NO_NDK=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+. "$topsrcdir/build/mozconfig.no-compile"
+
 # Global options
 ac_add_options --disable-tests
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --enable-updater
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,13 +1,17 @@
+NO_NDK=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+. "$topsrcdir/build/mozconfig.no-compile"
+
 # Global options
 ac_add_options --disable-tests
 
 # Android
 ac_add_options --target=i386-linux-android
 ac_add_options --with-android-min-sdk=15
 
 ac_add_options --enable-updater
--- a/testing/mozharness/configs/repackage/osx_signed.py
+++ b/testing/mozharness/configs/repackage/osx_signed.py
@@ -19,13 +19,13 @@ config = {
     ], [
         "mar",
         "-i", "{abs_work_dir}/inputs/target.tar.gz",
         "--mar", "{abs_work_dir}/inputs/mar",
         "-o", "{output_home}/target.complete.mar"
     ]],
 
     # ToolTool
-    "tooltool_manifest_src": 'browser/config/tooltool-manifests/macosx64/cross-releng.manifest',
+    "tooltool_manifest_src": 'browser/config/tooltool-manifests/macosx64/cross-l10n.manifest',
     "tooltool_url": 'http://relengapi/tooltool/',
     'tooltool_script': ["/builds/tooltool.py"],
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 }