Bug 1572859 - Package more aggressively when building GeckoView (and Fennec) within Gradle. r=agi

This always invokes `mach package` (in reality `make -C
... stage-package` for historical reasons), sacrificing a few seconds
of package-related time every Gradle build.  We then rely on Gradle's
fingerprinting to know when AAR/APK targets are up to date.

This should be much better for GeckoView engineers: the old input file
computations were simplifications tuned for Fennec engineers consuming
artifact builds.

Differential Revision: https://phabricator.services.mozilla.com/D41447

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nick Alexander 2019-08-14 20:38:42 +00:00
parent 03685b73e1
commit 76e3983210

View File

@ -209,16 +209,6 @@ def createMachStagePackageTask(name) {
dependsOn rootProject.machBuildFaster
// We'd prefer to take these from the :omnijar project directly, but
// it's awkward to reach across projects at evaluation time, so we
// duplicate the list here.
inputs.dir "${topsrcdir}/mobile/android/chrome"
inputs.dir "${topsrcdir}/mobile/android/components"
inputs.dir "${topsrcdir}/mobile/android/locales"
inputs.dir "${topsrcdir}/mobile/android/modules"
inputs.dir "${topsrcdir}/mobile/android/themes"
inputs.dir "${topsrcdir}/toolkit"
workingDir "${topobjdir}"
// We'd prefer this to be a `mach` invocation, but `mach build
@ -231,6 +221,9 @@ def createMachStagePackageTask(name) {
outputs.file "${topobjdir}/dist/fennec/assets/${mozconfig.substs.ANDROID_CPU_ARCH}/libxul.so"
outputs.file "${topobjdir}/dist/fennec/lib/${mozconfig.substs.ANDROID_CPU_ARCH}/libmozglue.so"
// Force running `stage-package`.
outputs.upToDateWhen { false }
// `path` is like `:machStagePackage`.
standardOutput = new TaggedLogOutputStream("${path}>", logger)
errorOutput = standardOutput