Bug 1505514 - geckoview artifacts don't specify branch when mozilla-release r=snorp a=release
authorJohan Lorenzo <jlorenzo@mozilla.com>
Tue, 13 Nov 2018 13:55:33 +0100
changeset 501183 17a9ab8d9200549682861bde9c01e27e4e22c308
parent 501182 6899c552516d5d302c73a776400b82e435007d5f
child 501184 7e437c76c2707ccadc0fcab0f2d24e7868c2a4c1
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp, release
bugs1505514
milestone64.0
Bug 1505514 - geckoview artifacts don't specify branch when mozilla-release r=snorp a=release Differential Revision: https://phabricator.services.mozilla.com/D11447
mobile/android/geckoview/build.gradle
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -291,17 +291,24 @@ android.libraryVariants.all { variant ->
     configureLibraryVariantWithJNIWrappers(variant, "Generated")
 }
 
 apply plugin: 'maven'
 
 uploadArchives {
     repositories.mavenDeployer {
         pom.groupId = 'org.mozilla.geckoview'
-        pom.artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}-${mozconfig.substs.ANDROID_CPU_ARCH}"
+
+        if (mozconfig.substs.MOZ_UPDATE_CHANNEL == 'release') {
+            // release artifacts don't specify the channel, for the sake of simplicity
+            pom.artifactId = "geckoview-${mozconfig.substs.ANDROID_CPU_ARCH}"
+        } else {
+            pom.artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}-${mozconfig.substs.ANDROID_CPU_ARCH}"
+        }
+
         pom.version = computeVersionNumber()
 
         pom.project {
             licenses {
                 license {
                     name 'The Mozilla Public License, v. 2.0'
                     url 'http://mozilla.org/MPL/2.0/'
                     distribution 'repo'