bug 918497 - fix android* release mozconfigs. r=rail a=lsblakk
authorAki Sasaki <asasaki@mozilla.com>
Tue, 29 Oct 2013 14:47:26 -0700
changeset 167270 378de7cc1bdf0c740077321b4e54849898f6802c
parent 167269 ff853b77741186886a29c7886813e06d78e60647
child 167271 868118c852cd143b393edf0a5de1b7f11acd538a
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, lsblakk
bugs918497
milestone27.0a2
bug 918497 - fix android* release mozconfigs. r=rail a=lsblakk
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"