bug 732110 - remove buildbot-configs/mozilla2/mobile. r=jhford
authorAki Sasaki <asasaki@mozilla.com>
Tue, 06 Mar 2012 19:58:19 -0800
changeset 5575 8ce6e0f9984bcea205afe8efbc28f90737eb6730
parent 5574 5d5c0774179810b17d9737c799aa93e1064f65db
child 5576 cb4024cf8bb4ab89b1b6f54a57bff6987e0ee9d5
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersjhford
bugs732110
bug 732110 - remove buildbot-configs/mozilla2/mobile. r=jhford
mozilla2/mobile/android/mobile-2.0/debug/mozconfig
mozilla2/mobile/android/mobile-2.0/nightly/mozconfig
mozilla2/mobile/android/mobile-2.0/release/mozconfig
mozilla2/mobile/android/mobile-browser/debug/mozconfig
mozilla2/mobile/android/mobile-browser/nightly/mozconfig
mozilla2/mobile/android/mobile-browser/release/mozconfig
mozilla2/mobile/android/mozilla-aurora/debug/mozconfig
mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig
mozilla2/mobile/android/mozilla-beta/debug/mozconfig
mozilla2/mobile/android/mozilla-beta/nightly/mozconfig
mozilla2/mobile/android/mozilla-beta/release/mozconfig
mozilla2/mobile/android/mozilla-release/release/mozconfig
mozilla2/mobile/linux-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/linux-i686/mobile-2.0/nightly/l10n-mozconfig
mozilla2/mobile/linux-i686/mobile-2.0/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-2.0/release/mozconfig
mozilla2/mobile/linux-i686/mobile-browser/nightly/l10n-mozconfig
mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-browser/release/mozconfig
mozilla2/mobile/linux-i686/mobile-e10s/nightly/mozconfig
mozilla2/mobile/linux-i686/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/mobile/linux-i686/mozilla-aurora/nightly/mozconfig
mozilla2/mobile/linux-i686/mozilla-beta/nightly/l10n-mozconfig
mozilla2/mobile/linux-i686/mozilla-beta/nightly/mozconfig
mozilla2/mobile/linux-i686/mozilla-beta/release/mozconfig
mozilla2/mobile/linux-i686/mozilla-release/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/macosx-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-2.0/nightly/l10n-mozconfig
mozilla2/mobile/macosx-i686/mobile-2.0/nightly/mozconfig
mozilla2/mobile/macosx-i686/mobile-2.0/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-browser/nightly/l10n-mozconfig
mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/macosx-i686/mobile-browser/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-e10s/nightly/mozconfig
mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/mozconfig
mozilla2/mobile/macosx-i686/mozilla-beta/nightly/l10n-mozconfig
mozilla2/mobile/macosx-i686/mozilla-beta/nightly/mozconfig
mozilla2/mobile/macosx-i686/mozilla-beta/release/mozconfig
mozilla2/mobile/macosx-i686/mozilla-release/release/mozconfig
mozilla2/mobile/win32-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/win32-i686/mobile-2.0/nightly/l10n-mozconfig
mozilla2/mobile/win32-i686/mobile-2.0/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-2.0/release/mozconfig
mozilla2/mobile/win32-i686/mobile-browser/nightly/l10n-mozconfig
mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-browser/release/mozconfig
mozilla2/mobile/win32-i686/mobile-e10s/nightly/mozconfig
mozilla2/mobile/win32-i686/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/mobile/win32-i686/mozilla-aurora/nightly/mozconfig
mozilla2/mobile/win32-i686/mozilla-beta/nightly/l10n-mozconfig
mozilla2/mobile/win32-i686/mozilla-beta/nightly/mozconfig
mozilla2/mobile/win32-i686/mozilla-beta/release/mozconfig
mozilla2/mobile/win32-i686/mozilla-release/release/mozconfig
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-2.0/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-mozilla-2.1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-2.0/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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=release
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-browser/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/nightly
deleted file mode 100644
--- a/mozilla2/mobile/android/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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=beta
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/aurora
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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=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
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/beta
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-debug-symbols="-gdwarf-2"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/branding/beta
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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=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
deleted file mode 100644
--- a/mozilla2/mobile/android/mozilla-release/release/mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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=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
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-1.1/nightly/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-ac_add_options --disable-ipc
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
-
-export CFLAGS="-gdwarf-2"  
-export CXXFLAGS="-gdwarf-2"
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-1.1/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-ac_add_options --disable-ipc
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
-
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"  
-export CXXFLAGS="-gdwarf-2"
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-2.0/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=BZ2
-
-ac_add_options --with-l10n-base=../../l10n-mozilla-2.0
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-2.0/release/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=BZ2
-
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mobile-e10s/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-aurora/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=BZ2
-
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-beta/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=BZ2
-
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/linux-i686/mozilla-release/release/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-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"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --disable-ipc
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-1.1/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-official-branding
-ac_add_options --disable-ipc
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-2.0/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --with-l10n-base=../../l10n-mozilla-2.0
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-2.0/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mobile-e10s/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-beta/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/macosx-i686/mozilla-release/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-application=mobile
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-1.1/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-ac_add_options --disable-ipc
-
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-1.1/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-official-branding
-ac_add_options --disable-ipc
-
-export MOZ_DEBUG_SYMBOLS=1
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-2.0/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-ac_add_options --with-l10n-base=../../l10n-mozilla-2.0
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
-ac_add_options --disable-angle
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-2.0/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
-ac_add_options --disable-angle
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mobile-e10s/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-aurora/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-ac_add_options --with-l10n-base=..
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
-ac_add_options --disable-angle
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-beta/nightly/l10n-mozconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-application=mobile
-ac_add_options --disable-compile-environment
-ac_add_options --disable-angle
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/mobile/win32-i686/mozilla-release/release/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-ac_add_options --enable-ipc
-ac_add_options --disable-webm
-
-ac_add_options --enable-debug-symbols
-export MOZILLA_OFFICIAL=1