From 0daf85506d5e7f053c0052f7915ba9865c905539 Mon Sep 17 00:00:00 2001 From: Bhavana Bajaj Date: Mon, 1 Apr 2013 12:07:20 -0700 Subject: [PATCH] Merging in branding changes NO BUG CLOSED TREE ba=release --- browser/confvars.sh | 6 +++--- mobile/android/config/mozconfigs/android-armv6/debug | 2 +- mobile/android/config/mozconfigs/android-armv6/l10n-nightly | 2 +- mobile/android/config/mozconfigs/android-armv6/nightly | 2 +- mobile/android/config/mozconfigs/android-noion/nightly | 2 +- mobile/android/config/mozconfigs/android-x86/debug | 2 +- mobile/android/config/mozconfigs/android-x86/l10n-nightly | 2 +- mobile/android/config/mozconfigs/android-x86/nightly | 2 +- mobile/android/config/mozconfigs/android/debug | 2 +- mobile/android/config/mozconfigs/android/l10n-nightly | 2 +- mobile/android/config/mozconfigs/android/nightly | 2 +- mobile/xul/config/mozconfigs/android/debug | 2 +- mobile/xul/config/mozconfigs/android/nightly | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) mode change 100755 => 100644 browser/confvars.sh diff --git a/browser/confvars.sh b/browser/confvars.sh old mode 100755 new mode 100644 index b14e60c70f07..eb72de57da88 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -40,15 +40,15 @@ MOZ_EXTENSIONS_DEFAULT=" gio" # For mozilla-beta, mozilla-release, or mozilla-central repositories, use # "nightly" branding (until bug 659568 is fixed). # For the mozilla-aurora repository, use "aurora". -MOZ_BRANDING_DIRECTORY=browser/branding/aurora +MOZ_BRANDING_DIRECTORY=browser/branding/nightly MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list # of values. -ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora +ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " -MAR_CHANNEL_ID=firefox-mozilla-aurora +MAR_CHANNEL_ID=firefox-mozilla-beta MOZ_PROFILE_MIGRATOR=1 MOZ_EXTENSION_MANAGER=1 MOZ_APP_STATIC_INI=1 diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug index a7153f812a40..eb4e7ba37be8 100644 --- a/mobile/android/config/mozconfigs/android-armv6/debug +++ b/mobile/android/config/mozconfigs/android-armv6/debug @@ -23,7 +23,7 @@ export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 export MOZ_PKG_SPECIAL=armv6 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly index 8009f3bb5a88..0ecb019ab64f 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly @@ -27,6 +27,6 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_PKG_SPECIAL=armv6 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta . "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-armv6/nightly b/mobile/android/config/mozconfigs/android-armv6/nightly index 508075d3a14d..95bcef7d494d 100644 --- a/mobile/android/config/mozconfigs/android-armv6/nightly +++ b/mobile/android/config/mozconfigs/android-armv6/nightly @@ -21,7 +21,7 @@ export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 export MOZ_PKG_SPECIAL=armv6 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android-noion/nightly b/mobile/android/config/mozconfigs/android-noion/nightly index 997b23de6d40..0c9dcc826760 100644 --- a/mobile/android/config/mozconfigs/android-noion/nightly +++ b/mobile/android/config/mozconfigs/android-noion/nightly @@ -19,7 +19,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug index d18e499af1b9..d68cf7c124ba 100644 --- a/mobile/android/config/mozconfigs/android-x86/debug +++ b/mobile/android/config/mozconfigs/android-x86/debug @@ -18,7 +18,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly index 6ba72c52ee27..142884da1b36 100644 --- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly @@ -25,6 +25,6 @@ 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/aurora +ac_add_options --with-branding=mobile/android/branding/beta . "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly index 158b5b1b6d3c..01cc2298317e 100644 --- a/mobile/android/config/mozconfigs/android-x86/nightly +++ b/mobile/android/config/mozconfigs/android-x86/nightly @@ -16,7 +16,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug index 74d756f9cc24..369f5718073a 100644 --- a/mobile/android/config/mozconfigs/android/debug +++ b/mobile/android/config/mozconfigs/android/debug @@ -18,7 +18,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly index 67be12dff8ab..1dfc28dfaaac 100644 --- a/mobile/android/config/mozconfigs/android/l10n-nightly +++ b/mobile/android/config/mozconfigs/android/l10n-nightly @@ -25,6 +25,6 @@ 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/aurora +ac_add_options --with-branding=mobile/android/branding/beta . "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/nightly b/mobile/android/config/mozconfigs/android/nightly index b64901fe74c0..430894d23632 100644 --- a/mobile/android/config/mozconfigs/android/nightly +++ b/mobile/android/config/mozconfigs/android/nightly @@ -16,7 +16,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/android/branding/aurora +ac_add_options --with-branding=mobile/android/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/xul/config/mozconfigs/android/debug b/mobile/xul/config/mozconfigs/android/debug index 2577ce9cddf1..d637cfdc0882 100644 --- a/mobile/xul/config/mozconfigs/android/debug +++ b/mobile/xul/config/mozconfigs/android/debug @@ -17,7 +17,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/xul/branding/aurora +ac_add_options --with-branding=mobile/xul/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors diff --git a/mobile/xul/config/mozconfigs/android/nightly b/mobile/xul/config/mozconfigs/android/nightly index 554959979d7e..6fa1ce692f45 100644 --- a/mobile/xul/config/mozconfigs/android/nightly +++ b/mobile/xul/config/mozconfigs/android/nightly @@ -1,7 +1,7 @@ . "$topsrcdir/mobile/xul/config/mozconfigs/android/common" # Build Fennec -ac_add_options --enable-application=mobile +ac_add_options --enable-application=mobile/xul # Android ac_add_options --target=arm-linux-androideabi @@ -15,7 +15,7 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -ac_add_options --with-branding=mobile/xul/branding/aurora +ac_add_options --with-branding=mobile/xul/branding/beta # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors