Bug 1371099 - Add merge day support for aarch64, r=aki DONTBUILD

MozReview-Commit-ID: LSf3f4nSMWc

--HG--
extra : rebase_source : c9d4eba077f614b320f622301817c0e7d59bc001
This commit is contained in:
Nick Thomas 2017-06-08 12:58:34 +12:00
parent 5a1d782b90
commit fe492d8ddb
2 changed files with 9 additions and 4 deletions

View File

@ -16,14 +16,16 @@ config = {
"ac_add_options --with-branding=mobile/android/branding/beta",
"ac_add_options --with-branding=mobile/android/branding/official")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
"mobile/android/config/mozconfigs/android-x86/",
"mobile/android/config/mozconfigs/android-aarch64/"]
for f in ["debug", "nightly", "l10n-nightly"]
] + [
# File, from, to
(f, "ac_add_options --with-l10n-base=../../mozilla-beta",
"ac_add_options --with-l10n-base=../../mozilla-release")
for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
"mobile/android/config/mozconfigs/android-x86/l10n-nightly"]
"mobile/android/config/mozconfigs/android-x86/l10n-nightly",
"mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
] + [
# File, from, to
("browser/confvars.sh",

View File

@ -15,7 +15,8 @@ config = {
"ac_add_options --with-branding=mobile/android/branding/nightly",
"ac_add_options --with-branding=mobile/android/branding/beta")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
"mobile/android/config/mozconfigs/android-x86/",
"mobile/android/config/mozconfigs/android-aarch64/"]
for f in ["debug", "nightly", "l10n-nightly"]
] + [
# File, from, to
@ -31,12 +32,14 @@ config = {
(f, "ac_add_options --with-l10n-base=../../l10n-central",
"ac_add_options --with-l10n-base=../../mozilla-beta")
for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
"mobile/android/config/mozconfigs/android-x86/l10n-nightly"]
"mobile/android/config/mozconfigs/android-x86/l10n-nightly",
"mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
] + [
# File, from, to
(f, "ac_add_options --enable-profiling", "") for f in
["mobile/android/config/mozconfigs/android-api-15/nightly",
"mobile/android/config/mozconfigs/android-x86/nightly",
"mobile/android/config/mozconfigs/android-aarch64/nightly",
"browser/config/mozconfigs/linux32/nightly",
"browser/config/mozconfigs/linux64/nightly",
"browser/config/mozconfigs/macosx64/nightly",