Created
June 19, 2015 02:02
-
-
Save rail/189ff7da2f181265a68e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CLOBBER b/CLOBBER | |
--- a/CLOBBER | |
+++ b/CLOBBER | |
@@ -17,9 +17,9 @@ | |
# | |
# Modifying this file will now automatically clobber the buildbot machines \o/ | |
# | |
# Are you updating CLOBBER because you think it's needed for your WebIDL | |
# changes to stick? As of bug 928195, this shouldn't be necessary! Please | |
# don't change CLOBBER for WebIDL changes any more. | |
-Bug 1167064: Switch to bluetooth APIv2. | |
+Merge day clobber | |
\ No newline at end of file | |
diff --git a/b2g/confvars.sh b/b2g/confvars.sh | |
--- a/b2g/confvars.sh | |
+++ b/b2g/confvars.sh | |
@@ -1,16 +1,16 @@ | |
# This Source Code Form is subject to the terms of the Mozilla Public | |
# License, v. 2.0. If a copy of the MPL was not distributed with this | |
# file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
MOZ_APP_BASENAME=B2G | |
MOZ_APP_VENDOR=Mozilla | |
-MOZ_APP_VERSION=41.0a1 | |
+MOZ_APP_VERSION=41.0a2 | |
MOZ_APP_UA_NAME=Firefox | |
MOZ_UA_OS_AGNOSTIC=1 | |
MOZ_B2G_VERSION=3.0.0.0-prerelease | |
MOZ_B2G_OS_NAME=Boot2Gecko | |
MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial | |
diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug | |
--- a/browser/config/mozconfigs/linux32/debug | |
+++ b/browser/config/mozconfigs/linux32/debug | |
@@ -14,11 +14,11 @@ export MOZILLA_OFFICIAL=1 | |
. "$topsrcdir/build/mozconfig.cache" | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly | |
--- a/browser/config/mozconfigs/linux32/nightly | |
+++ b/browser/config/mozconfigs/linux32/nightly | |
@@ -1,19 +1,19 @@ | |
. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt" | |
ac_add_options --enable-signmar | |
-ac_add_options --enable-profiling | |
+ | |
# Nightlies only since this has a cost in performance | |
ac_add_options --enable-js-diagnostics | |
# This will overwrite the default of stripping everything and keep the symbol table. | |
# This is useful for profiling and debugging and only increases the package size | |
# by 2 MBs. | |
STRIP_FLAGS="--strip-debug" | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
# Use ccache | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug | |
--- a/browser/config/mozconfigs/linux64/debug | |
+++ b/browser/config/mozconfigs/linux64/debug | |
@@ -14,11 +14,11 @@ export MOZILLA_OFFICIAL=1 | |
. "$topsrcdir/build/mozconfig.cache" | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly | |
--- a/browser/config/mozconfigs/linux64/nightly | |
+++ b/browser/config/mozconfigs/linux64/nightly | |
@@ -1,19 +1,19 @@ | |
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt" | |
ac_add_options --enable-signmar | |
-ac_add_options --enable-profiling | |
+ | |
# Nightlies only since this has a cost in performance | |
ac_add_options --enable-js-diagnostics | |
# This will overwrite the default of stripping everything and keep the symbol table. | |
# This is useful for profiling and debugging and only increases the package size | |
# by 2 MBs. | |
STRIP_FLAGS="--strip-debug" | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
# Use ccache | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly | |
--- a/browser/config/mozconfigs/macosx-universal/nightly | |
+++ b/browser/config/mozconfigs/macosx-universal/nightly | |
@@ -1,18 +1,18 @@ | |
. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt" | |
ac_add_options --disable-install-strip | |
ac_add_options --enable-signmar | |
-ac_add_options --enable-profiling | |
+ | |
ac_add_options --enable-instruments | |
ac_add_options --enable-dtrace | |
# Nightlies only since this has a cost in performance | |
ac_add_options --enable-js-diagnostics | |
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then | |
ac_add_options --with-macbundlename-prefix=Firefox | |
fi | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug | |
--- a/browser/config/mozconfigs/macosx64/debug | |
+++ b/browser/config/mozconfigs/macosx64/debug | |
@@ -13,11 +13,11 @@ ac_add_options --with-macbundlename-pref | |
fi | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly | |
--- a/browser/config/mozconfigs/macosx64/nightly | |
+++ b/browser/config/mozconfigs/macosx64/nightly | |
@@ -11,11 +11,11 @@ ac_add_options --with-macbundlename-pref | |
fi | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug | |
--- a/browser/config/mozconfigs/win32/debug | |
+++ b/browser/config/mozconfigs/win32/debug | |
@@ -21,13 +21,13 @@ export MOZILLA_OFFICIAL=1 | |
. $topsrcdir/build/win32/mozconfig.vs2013-win64 | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly | |
--- a/browser/config/mozconfigs/win32/nightly | |
+++ b/browser/config/mozconfigs/win32/nightly | |
@@ -1,14 +1,14 @@ | |
. "$topsrcdir/build/mozconfig.win-common" | |
. "$topsrcdir/browser/config/mozconfigs/win32/common-opt" | |
ac_add_options --enable-signmar | |
-ac_add_options --enable-profiling | |
+ | |
# Nightlies only since this has a cost in performance | |
ac_add_options --enable-js-diagnostics | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug | |
--- a/browser/config/mozconfigs/win64/debug | |
+++ b/browser/config/mozconfigs/win64/debug | |
@@ -21,15 +21,15 @@ ac_add_options --with-google-oauth-api-k | |
export MOZILLA_OFFICIAL=1 | |
# Treat warnings as errors in directories with FAIL_ON_WARNINGS. | |
ac_add_options --enable-warnings-as-errors | |
# Package js shell. | |
export MOZ_PACKAGE_JSSHELL=1 | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. $topsrcdir/build/win64/mozconfig.vs2013 | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly | |
--- a/browser/config/mozconfigs/win64/nightly | |
+++ b/browser/config/mozconfigs/win64/nightly | |
@@ -1,15 +1,15 @@ | |
. "$topsrcdir/build/mozconfig.win-common" | |
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" | |
. "$topsrcdir/browser/config/mozconfigs/win64/common-opt" | |
ac_add_options --enable-signmar | |
-ac_add_options --enable-profiling | |
+ | |
# Nightlies only since this has a cost in performance | |
ac_add_options --enable-js-diagnostics | |
-ac_add_options --with-branding=browser/branding/nightly | |
+ac_add_options --with-branding=browser/branding/aurora | |
. "$topsrcdir/build/mozconfig.cache" | |
. "$topsrcdir/build/mozconfig.common.override" | |
diff --git a/browser/config/version.txt b/browser/config/version.txt | |
--- a/browser/config/version.txt | |
+++ b/browser/config/version.txt | |
@@ -1,1 +1,1 @@ | |
-41.0a1 | |
+41.0a2 | |
diff --git a/browser/confvars.sh b/browser/confvars.sh | |
--- a/browser/confvars.sh | |
+++ b/browser/confvars.sh | |
@@ -47,19 +47,19 @@ MOZ_EXTENSIONS_DEFAULT=" gio" | |
# "unofficial" branding. | |
# For the mozilla-aurora repository, use "aurora". | |
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial | |
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-central | |
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora | |
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " | |
-MAR_CHANNEL_ID=firefox-mozilla-central | |
+MAR_CHANNEL_ID=firefox-mozilla-aurora | |
MOZ_PROFILE_MIGRATOR=1 | |
MOZ_APP_STATIC_INI=1 | |
MOZ_WEBAPP_RUNTIME=1 | |
MOZ_MEDIA_NAVIGATOR=1 | |
MOZ_WEBGL_CONFORMANT=1 | |
# Enable navigator.mozPay | |
MOZ_PAY=1 | |
# Enable activities. These are used for FxOS developers currently. | |
diff --git a/browser/locales/all-locales b/browser/locales/all-locales | |
--- a/browser/locales/all-locales | |
+++ b/browser/locales/all-locales | |
@@ -1,40 +1,95 @@ | |
+ach | |
+af | |
+an | |
ar | |
+as | |
ast | |
+az | |
+be | |
+bg | |
+bn-BD | |
+bn-IN | |
+br | |
+brx | |
+bs | |
+ca | |
cs | |
+cy | |
+da | |
de | |
+dsb | |
+el | |
en-GB | |
+en-ZA | |
eo | |
es-AR | |
es-CL | |
es-ES | |
es-MX | |
+et | |
+eu | |
fa | |
+ff | |
+fi | |
fr | |
fy-NL | |
+ga-IE | |
+gd | |
gl | |
+gu-IN | |
he | |
+hi-IN | |
+hr | |
+hsb | |
hu | |
+hy-AM | |
id | |
+is | |
it | |
ja | |
ja-JP-mac | |
+ka | |
kk | |
+km | |
+kn | |
ko | |
+kok | |
+ks | |
+lij | |
lt | |
lv | |
+mai | |
+mk | |
+ml | |
+mr | |
+ms | |
nb-NO | |
nl | |
nn-NO | |
+or | |
+pa-IN | |
pl | |
pt-BR | |
pt-PT | |
+rm | |
+ro | |
ru | |
+sat | |
+si | |
sk | |
sl | |
+son | |
+sq | |
+sr | |
sv-SE | |
+ta | |
+te | |
th | |
tr | |
uk | |
+ur | |
+uz | |
vi | |
+xh | |
zh-CN | |
zh-TW | |
diff --git a/browser/locales/shipped-locales b/browser/locales/shipped-locales | |
--- a/browser/locales/shipped-locales | |
+++ b/browser/locales/shipped-locales | |
@@ -1,62 +1,70 @@ | |
+ach | |
af | |
an | |
ar | |
+as | |
ast | |
+az | |
be | |
bg | |
bn-BD | |
bn-IN | |
br | |
bs | |
ca | |
cs | |
cy | |
da | |
de | |
+dsb | |
el | |
en-GB | |
en-US | |
en-ZA | |
eo | |
es-AR | |
es-CL | |
es-ES | |
es-MX | |
et | |
eu | |
fa | |
+ff | |
fi | |
fr | |
fy-NL | |
ga-IE | |
gd | |
gl | |
gu-IN | |
he | |
hi-IN | |
hr | |
+hsb | |
hu | |
hy-AM | |
id | |
is | |
it | |
ja linux win32 | |
ja-JP-mac osx | |
kk | |
+km | |
kn | |
ko | |
-ku | |
+lij | |
lt | |
lv | |
mai | |
mk | |
ml | |
mr | |
+ms | |
nb-NO | |
nl | |
nn-NO | |
or | |
pa-IN | |
pl | |
pt-BR | |
pt-PT | |
@@ -70,13 +78,13 @@ son | |
sq | |
sr | |
sv-SE | |
ta | |
te | |
th | |
tr | |
uk | |
+uz | |
vi | |
xh | |
zh-CN | |
zh-TW | |
-zu | |
diff --git a/config/milestone.txt b/config/milestone.txt | |
--- a/config/milestone.txt | |
+++ b/config/milestone.txt | |
@@ -5,9 +5,9 @@ | |
# x.x.x.x | |
# x.x.x+ | |
# | |
# Referenced by milestone.py. | |
# Hopefully I'll be able to automate replacement of *all* | |
# hardcoded milestones in the tree from these two files. | |
#-------------------------------------------------------- | |
-41.0a1 | |
+41.0a2 | |
diff --git a/mobile/android/config/mozconfigs/android-api-11/debug b/mobile/android/config/mozconfigs/android-api-11/debug | |
--- a/mobile/android/config/mozconfigs/android-api-11/debug | |
+++ b/mobile/android/config/mozconfigs/android-api-11/debug | |
@@ -5,15 +5,15 @@ ac_add_options --enable-debug | |
# Android | |
ac_add_options --with-android-min-sdk=11 | |
ac_add_options --target=arm-linux-androideabi | |
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 | |
. "$topsrcdir/mobile/android/config/mozconfigs/common.override" | |
diff --git a/mobile/android/config/mozconfigs/android-api-11/l10n-nightly b/mobile/android/config/mozconfigs/android-api-11/l10n-nightly | |
--- a/mobile/android/config/mozconfigs/android-api-11/l10n-nightly | |
+++ b/mobile/android/config/mozconfigs/android-api-11/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 | |
# Android | |
diff --git a/mobile/android/config/mozconfigs/android-api-11/nightly b/mobile/android/config/mozconfigs/android-api-11/nightly | |
--- a/mobile/android/config/mozconfigs/android-api-11/nightly | |
+++ b/mobile/android/config/mozconfigs/android-api-11/nightly | |
@@ -1,17 +1,17 @@ | |
. "$topsrcdir/mobile/android/config/mozconfigs/common" | |
-ac_add_options --enable-profiling | |
+ | |
# Android | |
ac_add_options --with-android-min-sdk=11 | |
ac_add_options --target=arm-linux-androideabi | |
-ac_add_options --with-branding=mobile/android/branding/nightly | |
+ac_add_options --with-branding=mobile/android/branding/aurora | |
# 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 MOZILLA_OFFICIAL=1 | |
export MOZ_TELEMETRY_REPORTING=1 | |
diff --git a/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug b/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug | |
--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug | |
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug | |
@@ -9,14 +9,14 @@ ac_add_options --with-android-max-sdk=10 | |
ac_add_options --enable-android-resource-constrained | |
export MOZ_DISABLE_GECKOVIEW=1 | |
ac_add_options --target=arm-linux-androideabi | |
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 | |
. "$topsrcdir/mobile/android/config/mozconfigs/common.override" | |
diff --git a/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly b/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly | |
--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly | |
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/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 | |
# Android | |
diff --git a/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly b/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly | |
--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly | |
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly | |
@@ -1,21 +1,21 @@ | |
. "$topsrcdir/mobile/android/config/mozconfigs/common" | |
-ac_add_options --enable-profiling | |
+ | |
# Android | |
ac_add_options --with-android-min-sdk=9 | |
ac_add_options --with-android-max-sdk=10 | |
ac_add_options --enable-android-resource-constrained | |
export MOZ_DISABLE_GECKOVIEW=1 | |
ac_add_options --target=arm-linux-androideabi | |
-ac_add_options --with-branding=mobile/android/branding/nightly | |
+ac_add_options --with-branding=mobile/android/branding/aurora | |
# 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 MOZILLA_OFFICIAL=1 | |
export MOZ_TELEMETRY_REPORTING=1 | |
diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug | |
--- a/mobile/android/config/mozconfigs/android-x86/debug | |
+++ b/mobile/android/config/mozconfigs/android-x86/debug | |
@@ -4,14 +4,14 @@ | |
ac_add_options --enable-debug | |
# Android | |
ac_add_options --target=i386-linux-android | |
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 | |
. "$topsrcdir/mobile/android/config/mozconfigs/common.override" | |
diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly | |
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly | |
+++ b/mobile/android/config/mozconfigs/android-x86/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 | |
# Android | |
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly | |
--- a/mobile/android/config/mozconfigs/android-x86/nightly | |
+++ b/mobile/android/config/mozconfigs/android-x86/nightly | |
@@ -1,15 +1,15 @@ | |
. "$topsrcdir/mobile/android/config/mozconfigs/common" | |
ac_add_options --target=i386-linux-android | |
-ac_add_options --enable-profiling | |
-ac_add_options --with-branding=mobile/android/branding/nightly | |
+ | |
+ac_add_options --with-branding=mobile/android/branding/aurora | |
# 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 MOZILLA_OFFICIAL=1 | |
export MOZ_TELEMETRY_REPORTING=1 | |
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh | |
--- a/mobile/android/confvars.sh | |
+++ b/mobile/android/confvars.sh | |
@@ -1,16 +1,16 @@ | |
# This Source Code Form is subject to the terms of the Mozilla Public | |
# License, v. 2.0. If a copy of the MPL was not distributed with this | |
# file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
MOZ_APP_BASENAME=Fennec | |
MOZ_APP_VENDOR=Mozilla | |
-MOZ_APP_VERSION=41.0a1 | |
+MOZ_APP_VERSION=41.0a2 | |
MOZ_APP_UA_NAME=Firefox | |
MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial | |
MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official | |
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh | |
# We support Android SDK version 9 and up by default. | |
# See the --enable-android-min-sdk and --enable-android-max-sdk arguments in configure.in. | |
diff --git a/mobile/android/locales/all-locales b/mobile/android/locales/all-locales | |
--- a/mobile/android/locales/all-locales | |
+++ b/mobile/android/locales/all-locales | |
@@ -1,46 +1,88 @@ | |
+ach | |
+af | |
+ak | |
ar | |
+an | |
+as | |
+az | |
be | |
+bn-IN | |
+br | |
ca | |
cs | |
+cy | |
da | |
de | |
+dsb | |
el | |
+en-GB | |
+en-ZA | |
+eo | |
es-AR | |
es-ES | |
+es-MX | |
et | |
eu | |
fa | |
+ff | |
fi | |
fr | |
fy-NL | |
ga-IE | |
gd | |
gl | |
+gu-IN | |
he | |
+hi-IN | |
+hr | |
+hsb | |
hu | |
+hy-AM | |
id | |
+is | |
it | |
+ja-JP-mac | |
ja | |
-ja-JP-mac | |
+kk | |
+km | |
+kn | |
ko | |
+lg | |
+lij | |
lt | |
+lv | |
+mai | |
+ml | |
+mr | |
+ms | |
+my | |
nb-NO | |
nl | |
nn-NO | |
+nso | |
+or | |
pa-IN | |
pl | |
pt-BR | |
pt-PT | |
ro | |
ru | |
sk | |
sl | |
+son | |
sq | |
sr | |
sv-SE | |
+sw | |
+ta | |
+te | |
th | |
tr | |
uk | |
+uz | |
vi | |
+wo | |
+xh | |
zh-CN | |
zh-TW | |
+zu | |
diff --git a/mobile/android/locales/maemo-locales b/mobile/android/locales/maemo-locales | |
--- a/mobile/android/locales/maemo-locales | |
+++ b/mobile/android/locales/maemo-locales | |
@@ -1,19 +1,69 @@ | |
+an | |
+as | |
+az | |
+be | |
+bn-IN | |
+br | |
+ca | |
cs | |
+cy | |
da | |
de | |
+dsb | |
+en-GB | |
+en-ZA | |
+eo | |
+es-AR | |
es-ES | |
+es-MX | |
+et | |
+eu | |
fi | |
+ff | |
fr | |
+fy-NL | |
+ga-IE | |
+gd | |
+gl | |
+gu-IN | |
+hi-IN | |
+hsb | |
+hu | |
+hy-AM | |
+id | |
+is | |
+it | |
ja | |
+kk | |
+kn | |
ko | |
-it | |
+lt | |
+lv | |
+mai | |
+ml | |
+mr | |
+ms | |
+my | |
nb-NO | |
nl | |
+or | |
+pa-IN | |
pl | |
pt-BR | |
pt-PT | |
+ro | |
ru | |
sk | |
+sl | |
+son | |
+sq | |
sv-SE | |
+ta | |
+te | |
+th | |
+tr | |
+uk | |
+uz | |
+xh | |
zh-CN | |
zh-TW |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment