Merging in branding changes NO BUG CLOSED TREE ba=release
authorAlex Keybl <akeybl@mozilla.com>
Mon, 07 Jan 2013 14:48:51 -0800
changeset 123504 853e7368747b1617ed401d166303f238d0b2aa80
parent 123503 89c8df49949363273c77d1cdf48e58143ac18d19
child 123505 59a4dd4441d1d0b533cfab4960e71b098ff8e730
push id3129
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 22:54:45 +0000
treeherdermozilla-aurora@090bc89ff6b4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.0a2
Merging in branding changes NO BUG CLOSED TREE ba=release
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/nightly
mobile/android/config/mozconfigs/android/debug
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/nightly
mobile/xul/config/mozconfigs/android/debug
mobile/xul/config/mozconfigs/android/nightly
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -18,15 +18,15 @@ ac_add_options --with-system-zlib
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # 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
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
@@ -22,9 +22,9 @@ ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
--- a/mobile/android/config/mozconfigs/android-armv6/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -16,15 +16,15 @@ ac_add_options --enable-update-channel=$
 # IonMonkey disabled in bug 789373
 ac_add_options --disable-ion
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # 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
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -13,15 +13,15 @@ ac_add_options --with-android-sdk="/tool
 ac_add_options --with-android-gnu-compiler-version=4.6
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # 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
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Build Fennec
@@ -20,9 +20,9 @@ ac_add_options --with-android-gnu-compil
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -11,17 +11,17 @@ ac_add_options --with-android-gnu-compil
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # 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.
--- a/mobile/xul/config/mozconfigs/android/debug
+++ b/mobile/xul/config/mozconfigs/android/debug
@@ -12,14 +12,14 @@ ac_add_options --with-android-ndk="/tool
 ac_add_options --with-android-sdk="/tools/android-sdk-r13/platforms/android-13"
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/xul/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/aurora
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/xul/config/mozconfigs/android/common.override"
--- a/mobile/xul/config/mozconfigs/android/nightly
+++ b/mobile/xul/config/mozconfigs/android/nightly
@@ -13,14 +13,14 @@ ac_add_options --with-android-sdk="/tool
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/xul/branding/nightly
+ac_add_options --with-branding=mobile/xul/branding/aurora
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/xul/config/mozconfigs/android/common.override"