bug 918497 - fix android* release mozconfigs for 25.0b2, now 26.0b1. r=rail a=akeybl
authorAki Sasaki <asasaki@mozilla.com>
Mon, 28 Oct 2013 22:06:38 -0700
changeset 160932 d0248e4d4357b469e22c49b617b7d9b4c140a30d
parent 160931 93544fa2458620c9e5bd9834f246d4f614e3e889
child 160933 ea99cb81069b49dc87ca428577a6227bbc47c25c
child 160937 a46d688e46dfbbf636e4b7782fa29dece260cfcb
push id2967
push userasasaki@mozilla.com
push dateTue, 29 Oct 2013 05:06:46 +0000
treeherdermozilla-beta@d0248e4d4357 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, akeybl
bugs918497
milestone26.0
bug 918497 - fix android* release mozconfigs for 25.0b2, now 26.0b1. r=rail a=akeybl
mobile/android/config/mozconfigs/android-armv6/release
mobile/android/config/mozconfigs/android-x86/release
mobile/android/config/mozconfigs/android/release
--- a/mobile/android/config/mozconfigs/android-armv6/release
+++ b/mobile/android/config/mozconfigs/android-armv6/release
@@ -1,32 +1,18 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
-if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
-  ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
-else
-  ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
-  ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
-fi
+export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-android-gnu-compiler-version=4.7
-ac_add_options --with-android-version=9
-ac_add_options --with-system-zlib
+ac_add_options --with-branding=mobile/android/branding/beta
+
 ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
-export MOZ_PKG_SPECIAL=armv6
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ b/mobile/android/config/mozconfigs/android-x86/release
@@ -1,30 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
 # Android
 ac_add_options --target=i386-linux-android
 
-if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
-  ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
-else
-  ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
-  ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
-fi
+ac_add_options --enable-updater
 
-ac_add_options --with-android-gnu-compiler-version=4.7
-ac_add_options --with-android-version=9
-ac_add_options --with-system-zlib
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android/release
+++ b/mobile/android/config/mozconfigs/android/release
@@ -1,30 +1,13 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-# Build Fennec
-ac_add_options --enable-application=mobile/android
-
-# Android
-ac_add_options --target=arm-linux-androideabi
+ac_add_options --enable-updater
 
-if test `uname -m` = 'x86_64'; then
-  ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
-  ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-16"
-else
-  ac_add_options --with-android-ndk="/tools/android-ndk-r8c"
-  ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
-fi
-
-ac_add_options --with-android-gnu-compiler-version=4.7
-ac_add_options --with-android-version=9
-ac_add_options --with-system-zlib
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"