diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml index 855f80114316..9370b8dcf53c 100644 --- a/taskcluster/ci/build/android.yml +++ b/taskcluster/ci/build/android.yml @@ -115,6 +115,16 @@ android-api-15-gradle/opt: env: # Bug 1292762 - Set GRADLE_USER_HOME to avoid sdk-manager-plugin intermittent GRADLE_USER_HOME: /home/worker/workspace/build/src/dotgradle + artifacts: + - name: public/android/geckoview.aar + path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries.aar + type: file + - name: public/android/geckoview_example.apk + path: /home/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/geckoview_example-withGeckoBinaries.apk + type: file + - name: public/build + path: /home/worker/artifacts/ + type: directory run: using: mozharness actions: [get-secrets build multi-l10n update] @@ -125,5 +135,3 @@ android-api-15-gradle/opt: script: "mozharness/scripts/fx_desktop_build.py" custom-build-variant-cfg: api-15-gradle tooltool-downloads: internal - - diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py index 9694c7e291b2..035d22c97c8f 100644 --- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py +++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py @@ -5,4 +5,13 @@ config = { 'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/nightly', 'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest', 'multi_locale_config_platform': 'android', + # It's not obvious, but postflight_build is after packaging, so the Gecko + # binaries are in the object directory, ready to be packaged into the + # GeckoView AAR. + 'postflight_build_mach_commands': [ + ['gradle', + 'geckoview:assembleWithGeckoBinaries', + 'geckoview_example:assembleWithGeckoBinaries', + ], + ], }