bug 918497 - fix android* release mozconfigs for 25.0b2. r=rail a=akeybl
authorAki Sasaki <asasaki@mozilla.com>
Mon, 23 Sep 2013 16:08:43 -0700
changeset 154109 cb50f8c75afdccd4ed1abeac4958aac7735932ad
parent 154108 8b54e887219458afeff427bc2d2813c1d7b1723b
child 154110 7d23197d995a568630745499ee8c0faaf163d427
child 154112 67ddcb28802ce9a4dedc7a18879e4de780448fca
child 154114 6fcf4d9e2ae864edcc0a07616b0f357a3d14ba36
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersrail, akeybl
bugs918497
milestone25.0
bug 918497 - fix android* release mozconfigs for 25.0b2. 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"