bug 701864 - (added mozconfigs only) support mobile builds+repacks out of mobile/ mobile/xul/, and mobile/android/. r=dougt
authorAki Sasaki <asasaki@mozilla.com>
Tue, 15 Nov 2011 18:09:17 -0800
changeset 5063 d92391c7908f9da4f9ac58055dd155a3557de6bd
parent 5062 2a9c8ee9da728ee258fc34ff4bac9cb732b91bbf
child 5064 e6767a55a5cda9214a307b2f16edb05fc9f8083e
push id3996
push userasasaki@mozilla.com
push dateWed, 16 Nov 2011 02:09:20 +0000
reviewersdougt
bugs701864
bug 701864 - (added mozconfigs only) support mobile builds+repacks out of mobile/ mobile/xul/, and mobile/android/. r=dougt
mozilla2/android-debug/accessibility/nightly/mozconfig
mozilla2/android-debug/electrolysis/nightly/mozconfig
mozilla2/android-debug/generic/nightly/mozconfig
mozilla2/android-debug/jaegermonkey/nightly/mozconfig
mozilla2/android-debug/mozilla-aurora/nightly/mozconfig
mozilla2/android-debug/mozilla-beta/nightly/mozconfig
mozilla2/android-debug/mozilla-central/nightly/mozconfig
mozilla2/android-debug/mozilla-release/nightly/mozconfig
mozilla2/android-debug/shadow-central/nightly/mozconfig
mozilla2/android-debug/try/nightly/mozconfig
mozilla2/android-debug/ux/nightly/mozconfig
mozilla2/android-xul/accessibility/nightly/mozconfig
mozilla2/android-xul/electrolysis/nightly/mozconfig
mozilla2/android-xul/generic/nightly/mozconfig
mozilla2/android-xul/jaegermonkey/nightly/mozconfig
mozilla2/android-xul/mozilla-aurora/nightly/mozconfig
mozilla2/android-xul/mozilla-beta/nightly/mozconfig
mozilla2/android-xul/mozilla-beta/release/mozconfig
mozilla2/android-xul/mozilla-central/nightly/mozconfig
mozilla2/android-xul/mozilla-release/nightly/mozconfig
mozilla2/android-xul/mozilla-release/release/mozconfig
mozilla2/android-xul/shadow-central/nightly/mozconfig
mozilla2/android-xul/try/nightly/mozconfig
mozilla2/android-xul/ux/nightly/mozconfig
mozilla2/android/accessibility/nightly/mozconfig
mozilla2/android/electrolysis/nightly/mozconfig
mozilla2/android/generic/nightly/mozconfig
mozilla2/android/jaegermonkey/nightly/mozconfig
mozilla2/android/mozilla-aurora/nightly/mozconfig
mozilla2/android/mozilla-beta/nightly/mozconfig
mozilla2/android/mozilla-beta/release/mozconfig
mozilla2/android/mozilla-central/nightly/mozconfig
mozilla2/android/mozilla-release/nightly/mozconfig
mozilla2/android/mozilla-release/release/mozconfig
mozilla2/android/shadow-central/nightly/mozconfig
mozilla2/android/try/nightly/mozconfig
mozilla2/android/ux/nightly/mozconfig
copy from mozilla2/linux-android-debug/accessibility/nightly/mozconfig
copy to mozilla2/android-debug/accessibility/nightly/mozconfig
--- a/mozilla2/linux-android-debug/accessibility/nightly/mozconfig
+++ b/mozilla2/android-debug/accessibility/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/electrolysis/nightly/mozconfig
copy to mozilla2/android-debug/electrolysis/nightly/mozconfig
--- a/mozilla2/linux-android-debug/electrolysis/nightly/mozconfig
+++ b/mozilla2/android-debug/electrolysis/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/generic/nightly/mozconfig
copy to mozilla2/android-debug/generic/nightly/mozconfig
--- a/mozilla2/linux-android-debug/generic/nightly/mozconfig
+++ b/mozilla2/android-debug/generic/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/jaegermonkey/nightly/mozconfig
copy to mozilla2/android-debug/jaegermonkey/nightly/mozconfig
--- a/mozilla2/linux-android-debug/jaegermonkey/nightly/mozconfig
+++ b/mozilla2/android-debug/jaegermonkey/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/mozilla-aurora/nightly/mozconfig
copy to mozilla2/android-debug/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/linux-android-debug/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/android-debug/mozilla-aurora/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/aurora
copy from mozilla2/linux-android-debug/mozilla-beta/nightly/mozconfig
copy to mozilla2/android-debug/mozilla-beta/nightly/mozconfig
--- a/mozilla2/linux-android-debug/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/android-debug/mozilla-beta/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/beta
+ac_add_options --with-branding=mobile/android/branding/beta
copy from mozilla2/linux-android-debug/mozilla-central/nightly/mozconfig
copy to mozilla2/android-debug/mozilla-central/nightly/mozconfig
--- a/mozilla2/linux-android-debug/mozilla-central/nightly/mozconfig
+++ b/mozilla2/android-debug/mozilla-central/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/mozilla-release/nightly/mozconfig
copy to mozilla2/android-debug/mozilla-release/nightly/mozconfig
--- a/mozilla2/linux-android-debug/mozilla-release/nightly/mozconfig
+++ b/mozilla2/android-debug/mozilla-release/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-android-eabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk"
 ac_add_options --with-android-sdk="/tools/android-sdk/platforms/android-8"
 ac_add_options --with-android-tools="/tools/android-sdk/tools"
 ac_add_options --with-system-zlib
copy from mozilla2/linux-android-debug/shadow-central/nightly/mozconfig
copy to mozilla2/android-debug/shadow-central/nightly/mozconfig
--- a/mozilla2/linux-android-debug/shadow-central/nightly/mozconfig
+++ b/mozilla2/android-debug/shadow-central/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android-debug/try/nightly/mozconfig
copy to mozilla2/android-debug/try/nightly/mozconfig
--- a/mozilla2/linux-android-debug/try/nightly/mozconfig
+++ b/mozilla2/android-debug/try/nightly/mozconfig
@@ -1,30 +1,30 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
 
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
-if [ -f $topsrcdir/mozconfig-extra-linux-android-debug ] ; then
-  . $topsrcdir/mozconfig-extra-linux-android-debug
+if [ -f $topsrcdir/mozconfig-extra-android-debug ] ; then
+  . $topsrcdir/mozconfig-extra-android-debug
 fi
copy from mozilla2/linux-android-debug/ux/nightly/mozconfig
copy to mozilla2/android-debug/ux/nightly/mozconfig
--- a/mozilla2/linux-android-debug/ux/nightly/mozconfig
+++ b/mozilla2/android-debug/ux/nightly/mozconfig
@@ -1,23 +1,23 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/accessibility/nightly/mozconfig
copy to mozilla2/android-xul/accessibility/nightly/mozconfig
--- a/mozilla2/linux-android/accessibility/nightly/mozconfig
+++ b/mozilla2/android-xul/accessibility/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly-accesibility
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/electrolysis/nightly/mozconfig
copy to mozilla2/android-xul/electrolysis/nightly/mozconfig
--- a/mozilla2/linux-android/electrolysis/nightly/mozconfig
+++ b/mozilla2/android-xul/electrolysis/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/generic/nightly/mozconfig
copy to mozilla2/android-xul/generic/nightly/mozconfig
--- a/mozilla2/linux-android/generic/nightly/mozconfig
+++ b/mozilla2/android-xul/generic/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/jaegermonkey/nightly/mozconfig
copy to mozilla2/android-xul/jaegermonkey/nightly/mozconfig
--- a/mozilla2/linux-android/jaegermonkey/nightly/mozconfig
+++ b/mozilla2/android-xul/jaegermonkey/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
copy to mozilla2/android-xul/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/android-xul/mozilla-aurora/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/aurora
+ac_add_options --with-branding=mobile/xul/branding/aurora
copy from mozilla2/linux-android/mozilla-beta/nightly/mozconfig
copy to mozilla2/android-xul/mozilla-beta/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/android-xul/mozilla-beta/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/beta
+ac_add_options --with-branding=mobile/xul/branding/beta
copy from mozilla2/linux-android/mozilla-beta/release/mozconfig
copy to mozilla2/android-xul/mozilla-beta/release/mozconfig
--- a/mozilla2/linux-android/mozilla-beta/release/mozconfig
+++ b/mozilla2/android-xul/mozilla-beta/release/mozconfig
@@ -1,14 +1,14 @@
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/branding/beta
+ac_add_options --with-branding=mobile/xul/branding/beta
copy from mozilla2/linux-android/mozilla-central/nightly/mozconfig
copy to mozilla2/android-xul/mozilla-central/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-central/nightly/mozconfig
+++ b/mozilla2/android-xul/mozilla-central/nightly/mozconfig
@@ -2,17 +2,17 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -20,9 +20,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/mozilla-release/nightly/mozconfig
copy to mozilla2/android-xul/mozilla-release/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-release/nightly/mozconfig
+++ b/mozilla2/android-xul/mozilla-release/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk/platforms/android-8"
 ac_add_options --with-android-tools="/tools/android-sdk/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/official
+ac_add_options --with-branding=mobile/xul/branding/official
copy from mozilla2/linux-android/mozilla-release/release/mozconfig
copy to mozilla2/android-xul/mozilla-release/release/mozconfig
--- a/mozilla2/linux-android/mozilla-release/release/mozconfig
+++ b/mozilla2/android-xul/mozilla-release/release/mozconfig
@@ -1,14 +1,14 @@
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk/platforms/android-8"
 ac_add_options --with-android-tools="/tools/android-sdk/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/branding/official
+ac_add_options --with-branding=mobile/xul/branding/official
copy from mozilla2/linux-android/shadow-central/nightly/mozconfig
copy to mozilla2/android-xul/shadow-central/nightly/mozconfig
--- a/mozilla2/linux-android/shadow-central/nightly/mozconfig
+++ b/mozilla2/android-xul/shadow-central/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/try/nightly/mozconfig
copy to mozilla2/android-xul/try/nightly/mozconfig
--- a/mozilla2/linux-android/try/nightly/mozconfig
+++ b/mozilla2/android-xul/try/nightly/mozconfig
@@ -1,31 +1,31 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
 
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
-if [ -f $topsrcdir/mozconfig-extra-linux-android ] ; then
-  . $topsrcdir/mozconfig-extra-linux-android
+if [ -f $topsrcdir/mozconfig-extra-android-xul ] ; then
+  . $topsrcdir/mozconfig-extra-android-xul
 fi
copy from mozilla2/linux-android/ux/nightly/mozconfig
copy to mozilla2/android-xul/ux/nightly/mozconfig
--- a/mozilla2/linux-android/ux/nightly/mozconfig
+++ b/mozilla2/android-xul/ux/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/xul
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/nightly
copy from mozilla2/linux-android/accessibility/nightly/mozconfig
copy to mozilla2/android/accessibility/nightly/mozconfig
--- a/mozilla2/linux-android/accessibility/nightly/mozconfig
+++ b/mozilla2/android/accessibility/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly-accesibility
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/electrolysis/nightly/mozconfig
copy to mozilla2/android/electrolysis/nightly/mozconfig
--- a/mozilla2/linux-android/electrolysis/nightly/mozconfig
+++ b/mozilla2/android/electrolysis/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/generic/nightly/mozconfig
copy to mozilla2/android/generic/nightly/mozconfig
--- a/mozilla2/linux-android/generic/nightly/mozconfig
+++ b/mozilla2/android/generic/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/jaegermonkey/nightly/mozconfig
copy to mozilla2/android/jaegermonkey/nightly/mozconfig
--- a/mozilla2/linux-android/jaegermonkey/nightly/mozconfig
+++ b/mozilla2/android/jaegermonkey/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
copy to mozilla2/android/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/android/mozilla-aurora/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/aurora
copy from mozilla2/linux-android/mozilla-beta/nightly/mozconfig
copy to mozilla2/android/mozilla-beta/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/android/mozilla-beta/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/beta
+ac_add_options --with-branding=mobile/android/branding/beta
copy from mozilla2/linux-android/mozilla-beta/release/mozconfig
copy to mozilla2/android/mozilla-beta/release/mozconfig
--- a/mozilla2/linux-android/mozilla-beta/release/mozconfig
+++ b/mozilla2/android/mozilla-beta/release/mozconfig
@@ -1,14 +1,14 @@
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/branding/beta
+ac_add_options --with-branding=mobile/android/branding/beta
copy from mozilla2/linux-android/mozilla-central/nightly/mozconfig
copy to mozilla2/android/mozilla-central/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-central/nightly/mozconfig
+++ b/mozilla2/android/mozilla-central/nightly/mozconfig
@@ -2,17 +2,17 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -20,9 +20,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/mozilla-release/nightly/mozconfig
copy to mozilla2/android/mozilla-release/nightly/mozconfig
--- a/mozilla2/linux-android/mozilla-release/nightly/mozconfig
+++ b/mozilla2/android/mozilla-release/nightly/mozconfig
@@ -1,15 +1,15 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk/platforms/android-8"
 ac_add_options --with-android-tools="/tools/android-sdk/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-android-platform=/
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/official
+ac_add_options --with-branding=mobile/android/branding/official
copy from mozilla2/linux-android/mozilla-release/release/mozconfig
copy to mozilla2/android/mozilla-release/release/mozconfig
--- a/mozilla2/linux-android/mozilla-release/release/mozconfig
+++ b/mozilla2/android/mozilla-release/release/mozconfig
@@ -1,14 +1,14 @@
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk/platforms/android-8"
 ac_add_options --with-android-tools="/tools/android-sdk/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
@@ -17,9 +17,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=mobile/branding/official
+ac_add_options --with-branding=mobile/android/branding/official
copy from mozilla2/linux-android/shadow-central/nightly/mozconfig
copy to mozilla2/android/shadow-central/nightly/mozconfig
--- a/mozilla2/linux-android/shadow-central/nightly/mozconfig
+++ b/mozilla2/android/shadow-central/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
copy from mozilla2/linux-android/try/nightly/mozconfig
copy to mozilla2/android/try/nightly/mozconfig
--- a/mozilla2/linux-android/try/nightly/mozconfig
+++ b/mozilla2/android/try/nightly/mozconfig
@@ -1,31 +1,31 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly
 
 if [ -f $topsrcdir/mozconfig-extra ] ; then
   . $topsrcdir/mozconfig-extra
 fi
-if [ -f $topsrcdir/mozconfig-extra-linux-android ] ; then
-  . $topsrcdir/mozconfig-extra-linux-android
+if [ -f $topsrcdir/mozconfig-extra-android ] ; then
+  . $topsrcdir/mozconfig-extra-android
 fi
copy from mozilla2/linux-android/ux/nightly/mozconfig
copy to mozilla2/android/ux/nightly/mozconfig
--- a/mozilla2/linux-android/ux/nightly/mozconfig
+++ b/mozilla2/android/ux/nightly/mozconfig
@@ -1,24 +1,24 @@
 # Global options
 mk_add_options MOZ_MAKE_FLAGS=-j4
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
-ac_add_options --enable-application=mobile
+ac_add_options --enable-application=mobile/android
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-endian=little
 ac_add_options --with-android-ndk="/tools/android-ndk-r5c"
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-tools="/tools/android-sdk-r13/tools"
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 #ac_add_options --enable-updater
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/nightly