From facaaf76ab05729a801d2af27c9fea4b52090c6e Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Tue, 23 Jul 2013 17:33:09 -0700
Subject: [PATCH] Backout 2571b6bbc93a (bug 894885) for possibly breaking
 Android tests

---
 .../config/mozconfigs/android-armv6/nightly       | 10 +---------
 .../android/config/mozconfigs/android-x86/nightly | 15 ---------------
 mobile/android/config/mozconfigs/android/nightly  | 15 ---------------
 mobile/android/config/mozconfigs/common           | 14 ++++++++++++++
 4 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/mobile/android/config/mozconfigs/android-armv6/nightly b/mobile/android/config/mozconfigs/android-armv6/nightly
index 3d1306c06dc5..7ed9409bf31b 100644
--- a/mobile/android/config/mozconfigs/android-armv6/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -3,12 +3,4 @@
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
-export MOZ_PKG_SPECIAL=armv6
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
+export MOZ_PKG_SPECIAL=armv6
\ No newline at end of file
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly
index 20e7f239950f..8dbc9f7b4d13 100644
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -1,18 +1,3 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --target=i386-linux-android
-
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling with eideticker. See bug 788680
-STRIP_FLAGS="--strip-debug"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android/nightly b/mobile/android/config/mozconfigs/android/nightly
index 5d2cf61730a6..e2b67e53fd47 100644
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -1,16 +1 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling with eideticker. See bug 788680
-STRIP_FLAGS="--strip-debug"
-
-export JAVA_HOME=/tools/jdk6
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 9c0742838080..1942c376575b 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -35,9 +35,23 @@ ac_add_options --with-android-gnu-compiler-version=4.7
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-profiling
+ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
+
+export JAVA_HOME=/tools/jdk6
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+ac_add_options --with-branding=mobile/android/branding/nightly
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling with eideticker. See bug 788680
+STRIP_FLAGS="--strip-debug"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"