Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1370753 - Add Google API key to Android builds. r=glandium

Browse Source 
MozReview-Commit-ID: KDgbZr7ygpk

--HG--
extra : rebase_source : e7d36890caaf843746b7ec78a8daf697221e7c53
extra : histedit_source : 4a48d1ad38cfd99797524a2cad09cc7acdba102f
This commit is contained in:
Gian-Carlo Pascutto 2017-07-26 12:46:02 +02:00
parent da0fc06913
commit c2aae39fd6
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
View File

@ -30,6 +30,7 @@ mk_add_options AUTOCLOBBER=
# Disable Keyfile Loading (and checks) since l10n doesn't need these keys
# This overrides the settings in the common android mozconfig
ac_add_options --without-mozilla-api-keyfile
ac_add_options --without-google-api-keyfile
ac_add_options --without-adjust-sdk-keyfile
ac_add_options --without-leanplum-sdk-keyfile
# Similarly explicitly disable install tracking for l10n, we'll inherit from en-US

1
mobile/android/config/mozconfigs/android-api-15/l10n-nightly
View File

@ -30,6 +30,7 @@ mk_add_options AUTOCLOBBER=
# Disable Keyfile Loading (and checks) since l10n doesn't need these keys
# This overrides the settings in the common android mozconfig
ac_add_options --without-mozilla-api-keyfile
ac_add_options --without-google-api-keyfile
ac_add_options --without-adjust-sdk-keyfile
ac_add_options --without-leanplum-sdk-keyfile
# Similarly explicitly disable install tracking for l10n, we'll inherit from en-US

1
mobile/android/config/mozconfigs/common
View File

@ -41,6 +41,7 @@ fi
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-google-api-keyfile=/builds/gapi.data
ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
# MOZ_INSTALL_TRACKING does not guarantee MOZ_UPDATE_CHANNEL will be set so we

4
testing/mozharness/configs/builds/releng_base_android_64_builds.py
View File

@ -30,6 +30,7 @@ config = {
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/relengapi.tok', '/builds/relengapi.tok'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
@ -38,6 +39,9 @@ config = {
('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
],
'secret_files': [
{'filename': '/builds/gapi.data',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
'min_scm_level': 1},
{'filename': '/builds/mozilla-fennec-geoloc-api.key',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-fennec-geoloc-api.key',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},