diff --git a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly index c2b9c0e9f469..f888396f403c 100644 --- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly @@ -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 diff --git a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly index ecb59704ea48..48780538b6f4 100644 --- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly @@ -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 diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common index 20091b3550d7..5f9b234c244d 100644 --- a/mobile/android/config/mozconfigs/common +++ b/mobile/android/config/mozconfigs/common @@ -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 diff --git a/testing/mozharness/configs/builds/releng_base_android_64_builds.py b/testing/mozharness/configs/builds/releng_base_android_64_builds.py index c43baac0d56a..c04277e66068 100644 --- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py @@ -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'},