bug 557260 - copy mobile mozconfigs to new locations r=aki
authorJohn Ford <jhford@mozilla.com>
Wed, 25 May 2011 22:47:55 -0400
changeset 4151 47d5646788eac5687ec9389f88e5582b4172f8fd
parent 4150 1547832c2cef2e746e336eedbfb0fa6efd59a6d9
child 4152 c61ab00a3285e34e0393a68d7edb25895cb2d1ea
push id3259
push userjford@mozilla.com
push dateThu, 26 May 2011 02:48:01 +0000
reviewersaki
bugs557260
bug 557260 - copy mobile mozconfigs to new locations r=aki
mozilla2/linux-android-debug/electrolysis/nightly/mozconfig
mozilla2/linux-android-debug/generic/nightly/mozconfig
mozilla2/linux-android-debug/mozilla-aurora/nightly/mozconfig
mozilla2/linux-android-debug/mozilla-beta/nightly/mozconfig
mozilla2/linux-android-debug/mozilla-central/nightly/mozconfig
mozilla2/linux-android-debug/tracemonkey/nightly/mozconfig
mozilla2/linux-android-debug/try/nightly/mozconfig
mozilla2/linux-android-debug/ux/nightly/mozconfig
mozilla2/linux-android/electrolysis/nightly/mozconfig
mozilla2/linux-android/generic/nightly/mozconfig
mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
mozilla2/linux-android/mozilla-beta/nightly/mozconfig
mozilla2/linux-android/mozilla-central/nightly/mozconfig
mozilla2/linux-android/tracemonkey/nightly/mozconfig
mozilla2/linux-android/try/nightly/mozconfig
mozilla2/linux-android/ux/nightly/mozconfig
mozilla2/linux-maemo5-gtk/electrolysis/nightly/mozconfig
mozilla2/linux-maemo5-gtk/generic/nightly/mozconfig
mozilla2/linux-maemo5-gtk/mozilla-aurora/nightly/mozconfig
mozilla2/linux-maemo5-gtk/mozilla-beta/nightly/mozconfig
mozilla2/linux-maemo5-gtk/mozilla-central/nightly/mozconfig
mozilla2/linux-maemo5-gtk/tracemonkey/nightly/mozconfig
mozilla2/linux-maemo5-gtk/try/nightly/mozconfig
mozilla2/linux-maemo5-gtk/ux/nightly/mozconfig
mozilla2/linux-maemo5-qt/electrolysis/nightly/mozconfig
mozilla2/linux-maemo5-qt/generic/nightly/mozconfig
mozilla2/linux-maemo5-qt/mozilla-aurora/nightly/mozconfig
mozilla2/linux-maemo5-qt/mozilla-beta/nightly/mozconfig
mozilla2/linux-maemo5-qt/mozilla-central/nightly/mozconfig
mozilla2/linux-maemo5-qt/tracemonkey/nightly/mozconfig
mozilla2/linux-maemo5-qt/try/nightly/mozconfig
mozilla2/linux-maemo5-qt/ux/nightly/mozconfig
mozilla2/linux-mobile/electrolysis/nightly/mozconfig
mozilla2/linux-mobile/generic/nightly/mozconfig
mozilla2/linux-mobile/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/linux-mobile/mozilla-aurora/nightly/mozconfig
mozilla2/linux-mobile/mozilla-beta/nightly/l10n-mozconfig
mozilla2/linux-mobile/mozilla-beta/nightly/mozconfig
mozilla2/linux-mobile/mozilla-central/nightly/l10n-mozconfig
mozilla2/linux-mobile/mozilla-central/nightly/mozconfig
mozilla2/linux-mobile/tracemonkey/nightly/mozconfig
mozilla2/linux-mobile/try/nightly/mozconfig
mozilla2/linux-mobile/ux/nightly/mozconfig
mozilla2/macosx-mobile/electrolysis/nightly/mozconfig
mozilla2/macosx-mobile/generic/nightly/mozconfig
mozilla2/macosx-mobile/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/macosx-mobile/mozilla-aurora/nightly/mozconfig
mozilla2/macosx-mobile/mozilla-beta/nightly/l10n-mozconfig
mozilla2/macosx-mobile/mozilla-beta/nightly/mozconfig
mozilla2/macosx-mobile/mozilla-central/nightly/l10n-mozconfig
mozilla2/macosx-mobile/mozilla-central/nightly/mozconfig
mozilla2/macosx-mobile/tracemonkey/nightly/mozconfig
mozilla2/macosx-mobile/try/nightly/mozconfig
mozilla2/macosx-mobile/ux/nightly/mozconfig
mozilla2/win32-mobile/electrolysis/nightly/mozconfig
mozilla2/win32-mobile/generic/nightly/mozconfig
mozilla2/win32-mobile/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/win32-mobile/mozilla-aurora/nightly/mozconfig
mozilla2/win32-mobile/mozilla-beta/nightly/l10n-mozconfig
mozilla2/win32-mobile/mozilla-beta/nightly/mozconfig
mozilla2/win32-mobile/mozilla-central/nightly/l10n-mozconfig
mozilla2/win32-mobile/mozilla-central/nightly/mozconfig
mozilla2/win32-mobile/tracemonkey/nightly/mozconfig
mozilla2/win32-mobile/try/nightly/mozconfig
mozilla2/win32-mobile/ux/nightly/mozconfig
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/electrolysis/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/generic/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/generic/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mozilla-aurora/debug/mozconfig
copy to mozilla2/linux-android-debug/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/android/mozilla-aurora/debug/mozconfig
+++ b/mozilla2/linux-android-debug/mozilla-aurora/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mozilla-beta/debug/mozconfig
copy to mozilla2/linux-android-debug/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/android/mozilla-beta/debug/mozconfig
+++ b/mozilla2/linux-android-debug/mozilla-beta/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
@@ -15,10 +11,8 @@ 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
 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
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/mozilla-central/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/tracemonkey/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/try/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/try/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/debug/mozconfig
copy to mozilla2/linux-android-debug/ux/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ b/mozilla2/linux-android-debug/ux/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/electrolysis/nightly/mozconfig
@@ -1,26 +1,19 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # 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
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=nightly
+#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
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/generic/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/generic/nightly/mozconfig
@@ -1,26 +1,19 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # 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
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=nightly
+#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
copy from mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig
copy to mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mozilla-beta/nightly/mozconfig
copy to mozilla2/linux-android/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/android/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux-android/mozilla-beta/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/mozilla-central/nightly/mozconfig
@@ -1,12 +1,8 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # Android
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/tracemonkey/nightly/mozconfig
@@ -1,26 +1,19 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # 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
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=nightly
+#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
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/try/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/try/nightly/mozconfig
@@ -1,26 +1,19 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # 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
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=nightly
+#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
copy from mozilla2/mobile/android/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-android/ux/nightly/mozconfig
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-android/ux/nightly/mozconfig
@@ -1,26 +1,19 @@
-# Uncomment these two lines to use objdir with client.mk
-OBJDIR=objdir
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/$OBJDIR
-
 # Global options
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 
 # Build Fennec
 ac_add_options --enable-application=mobile
 
 # 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
-ac_add_options --enable-updater
-ac_add_options --enable-update-channel=nightly
+#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
copy from mozilla2/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/electrolysis/nightly/mozconfig
@@ -1,10 +1,9 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 ac_add_options --enable-ipc
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
copy from mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/generic/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/generic/nightly/mozconfig
@@ -1,15 +1,12 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-gtk/mozilla-aurora/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/mozilla-aurora/nightly/mozconfig
@@ -1,10 +1,9 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
copy from mozilla2/mobile/maemo5-gtk/mozilla-beta/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/mozilla-beta/nightly/mozconfig
@@ -1,10 +1,9 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
copy from mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/mozilla-central/nightly/mozconfig
@@ -1,10 +1,9 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
copy from mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/tracemonkey/nightly/mozconfig
@@ -1,15 +1,12 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/try/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/try/nightly/mozconfig
@@ -1,15 +1,12 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-gtk/ux/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-gtk/ux/nightly/mozconfig
@@ -1,15 +1,12 @@
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/electrolysis/nightly/mozconfig
@@ -1,12 +1,11 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
copy from mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/generic/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/generic/nightly/mozconfig
@@ -1,20 +1,17 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-qt/mozilla-aurora/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/mozilla-aurora/nightly/mozconfig
@@ -1,12 +1,11 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
copy from mozilla2/mobile/maemo5-qt/mozilla-beta/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/mozilla-beta/nightly/mozconfig
@@ -1,12 +1,11 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
copy from mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/mozilla-central/nightly/mozconfig
@@ -1,12 +1,11 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
copy from mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/tracemonkey/nightly/mozconfig
@@ -1,20 +1,17 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/try/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/try/nightly/mozconfig
@@ -1,20 +1,17 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-maemo5-qt/ux/nightly/mozconfig
--- a/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-maemo5-qt/ux/nightly/mozconfig
@@ -1,20 +1,17 @@
 #ac_add_options --with-qtdir=/opt/qt4-maemo5
 
 mk_add_options MOZ_MAKE_FLAGS=-j4
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 
 #ac_add_options --enable-debug
 #ac_add_options --disable-optimize
 
 ac_add_options --enable-application=mobile
 ac_add_options --with-arm-kuser
 #ac_add_options --enable-ipc
 ac_add_options --enable-default-toolkit=cairo-qt
 ac_add_options --disable-crashreporter
 
 ac_add_options --with-maemo-version=5
 
 ac_add_options --prefix=/opt/mozilla
 ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --with-branding=mobile/branding/nightly
copy from mozilla2/mobile/linux-i686/mobile-e10s/nightly/mozconfig
copy to mozilla2/linux-mobile/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-e10s/nightly/mozconfig
+++ b/mozilla2/linux-mobile/electrolysis/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-mobile/generic/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-mobile/generic/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mozilla-aurora/nightly/l10n-mozconfig
copy to mozilla2/linux-mobile/mozilla-aurora/nightly/l10n-mozconfig
copy from mozilla2/mobile/linux-i686/mozilla-aurora/nightly/mozconfig
copy to mozilla2/linux-mobile/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/linux-mobile/mozilla-aurora/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mozilla-beta/nightly/l10n-mozconfig
copy to mozilla2/linux-mobile/mozilla-beta/nightly/l10n-mozconfig
copy from mozilla2/mobile/linux-i686/mozilla-beta/nightly/mozconfig
copy to mozilla2/linux-mobile/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/linux-mobile/mozilla-beta/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/l10n-mozconfig
copy to mozilla2/linux-mobile/mozilla-central/nightly/l10n-mozconfig
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-mobile/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-mobile/mozilla-central/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-mobile/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-mobile/tracemonkey/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-mobile/try/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-mobile/try/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/linux-mobile/ux/nightly/mozconfig
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/linux-mobile/ux/nightly/mozconfig
@@ -1,9 +1,8 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=BZ2
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
 
 CC=/tools/gcc-4.3.3/installed/bin/gcc
 CXX=/tools/gcc-4.3.3/installed/bin/g++
 
 ac_add_options --enable-debug-symbols="-gdwarf-2"
copy from mozilla2/mobile/macosx-i686/mobile-e10s/nightly/mozconfig
copy to mozilla2/macosx-mobile/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-e10s/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/electrolysis/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/macosx-mobile/generic/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/generic/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/l10n-mozconfig
copy to mozilla2/macosx-mobile/mozilla-aurora/nightly/l10n-mozconfig
copy from mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/mozconfig
copy to mozilla2/macosx-mobile/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/mozilla-aurora/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mozilla-beta/nightly/l10n-mozconfig
copy to mozilla2/macosx-mobile/mozilla-beta/nightly/l10n-mozconfig
copy from mozilla2/mobile/macosx-i686/mozilla-beta/nightly/mozconfig
copy to mozilla2/macosx-mobile/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/mozilla-beta/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/l10n-mozconfig
copy to mozilla2/macosx-mobile/mozilla-central/nightly/l10n-mozconfig
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/macosx-mobile/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/mozilla-central/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/macosx-mobile/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/tracemonkey/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/macosx-mobile/try/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/try/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/macosx-mobile/ux/nightly/mozconfig
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/macosx-mobile/ux/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf213
 
 # Global options
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_cv_visibility_pragma=no
 
 ac_add_options --disable-install-strip
 ac_add_options --disable-installer
copy from mozilla2/mobile/win32-i686/mobile-e10s/nightly/mozconfig
copy to mozilla2/win32-mobile/electrolysis/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-e10s/nightly/mozconfig
+++ b/mozilla2/win32-mobile/electrolysis/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/win32-mobile/generic/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/win32-mobile/generic/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mozilla-aurora/nightly/l10n-mozconfig
copy to mozilla2/win32-mobile/mozilla-aurora/nightly/l10n-mozconfig
copy from mozilla2/mobile/win32-i686/mozilla-aurora/nightly/mozconfig
copy to mozilla2/win32-mobile/mozilla-aurora/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mozilla-aurora/nightly/mozconfig
+++ b/mozilla2/win32-mobile/mozilla-aurora/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mozilla-beta/nightly/l10n-mozconfig
copy to mozilla2/win32-mobile/mozilla-beta/nightly/l10n-mozconfig
copy from mozilla2/mobile/win32-i686/mozilla-beta/nightly/mozconfig
copy to mozilla2/win32-mobile/mozilla-beta/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mozilla-beta/nightly/mozconfig
+++ b/mozilla2/win32-mobile/mozilla-beta/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/l10n-mozconfig
copy to mozilla2/win32-mobile/mozilla-central/nightly/l10n-mozconfig
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/win32-mobile/mozilla-central/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/win32-mobile/mozilla-central/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/win32-mobile/tracemonkey/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/win32-mobile/tracemonkey/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/win32-mobile/try/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/win32-mobile/try/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile
copy from mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
copy to mozilla2/win32-mobile/ux/nightly/mozconfig
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ b/mozilla2/win32-mobile/ux/nightly/mozconfig
@@ -1,10 +1,9 @@
 # Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options MOZ_PKG_FORMAT=ZIP
 
 export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
 
 ac_add_options --enable-tests
 ac_add_options --enable-jemalloc
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-application=mobile