Backed out changeset ec9a256c6703 (bug 1505514) for failing gradle toolchains a=backout
authorRazvan Maries <rmaries@mozilla.com>
Mon, 12 Nov 2018 16:47:00 +0200
changeset 501160 4fe80a60a6a04458add149d68b2dd2f7224f65f9
parent 501159 bc53b14823111dc83c79092fba260fa0b436da78
child 501161 f7221b7dad3fac285b301f3b43275c76854f79a7
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)
reviewersbackout
bugs1505514
milestone64.0
backs outec9a256c6703565eafd888030b9502f55092de38
Backed out changeset ec9a256c6703 (bug 1505514) for failing gradle toolchains a=backout
mobile/android/geckoview/build.gradle
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -291,24 +291,17 @@ android.libraryVariants.all { variant ->
     configureLibraryVariantWithJNIWrappers(variant, "Generated")
 }
 
 apply plugin: 'maven'
 
 uploadArchives {
     repositories.mavenDeployer {
         pom.groupId = 'org.mozilla.geckoview'
-
-        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.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'