Bug 1508976 - Post: Don't include architecture in multi-architecture GeckoView artifactId. r=snorp

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nick Alexander 2019-05-30 15:22:19 +00:00
parent 5893476bdb
commit 0886f39ee6

View File

@ -332,10 +332,20 @@ publishing {
groupId = 'org.mozilla.geckoview'
if (mozconfig.substs.MOZ_UPDATE_CHANNEL == 'release') {
// release artifacts don't specify the channel, for the sake of simplicity
artifactId = "geckoview-${mozconfig.substs.ANDROID_CPU_ARCH}"
// Release artifacts don't specify the channel, for the sake of simplicity.
artifactId = 'geckoview'
} else {
artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}-${mozconfig.substs.ANDROID_CPU_ARCH}"
artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}"
}
if (mozconfig.substs.MOZILLA_OFFICIAL && !mozconfig.substs.MOZ_ANDROID_FAT_AAR_ARCHITECTURES) {
// In automation, per-architecture artifacts identify
// the architecture; multi-architecture artifacts don't.
// When building locally, we produce a "skinny AAR" with
// one target architecture masquerading as a "fat AAR"
// to enable Gradle composite builds to substitute this
// project into consumers easily.
artifactId = "${artifactId}-${mozconfig.substs.ANDROID_CPU_ARCH}"
}
url = 'https://wiki.mozilla.org/Mobile/GeckoView'