Bug 1508976 - Post: Don't include architecture in multi-architecture GeckoView artifactId. r=snorp
☠☠ backed out by be4b780a7783 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 05 Mar 2019 17:48:35 +0000
changeset 520282 da57df805c568ba2af98d1d62fc3756584e84682
parent 520281 4e5d97c935151d28d1e06943133951918ac28568
child 520283 91c31d2a7706c7d32384891f4ad39111bd6d5370
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1508976
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508976 - Post: Don't include architecture in multi-architecture GeckoView artifactId. r=snorp Differential Revision: https://phabricator.services.mozilla.com/D15772
mobile/android/geckoview/build.gradle
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -326,20 +326,30 @@ version = computeVersionNumber()
 publishing {
     publications {
         android.libraryVariants.all { variant ->
             "${variant.name}"(MavenPublication) {
                 pom {
                     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_TARGETS) {
+                        // 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'
 
                     licenses {
                         license {
                             name = 'The Mozilla Public License, v. 2.0'
                             url = 'http://mozilla.org/MPL/2.0/'