Bug 1509572 - Part 5: Depend on bundle, not assemble. r=snorp
☠☠ backed out by 79ae8ec996e6 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Mon, 26 Nov 2018 19:16:16 +0000
changeset 504555 f6653c7d29671c942662c75945ae4f82ef21a31d
parent 504554 122d6f1a1136f696c88481c1cb1d97451a952a77
child 504556 9f6a7e664cef95703e629aa3fd02cd6a5b014f54
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1509572
milestone65.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 1509572 - Part 5: Depend on bundle, not assemble. r=snorp This will be exploited later, when we start making the `withGeckoBinaries` switch conditional on the tasks that Gradle is going to execute. Depends on D12793 Differential Revision: https://phabricator.services.mozilla.com/D12794
mobile/android/app/build.gradle
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -406,17 +406,17 @@ android.applicationVariants.all { varian
         reportLevel = "high"   // For now we only care about high priority bugs. After we have fixed
                                // the issues with medium/low priority we can lower the report level here.
 
         classes = files("$project.buildDir/intermediates/classes")
         source = variant.javaCompile.source
         classpath = variant.javaCompile.classpath
 
         excludeFilter = file("findbugs-exclude.xml")
-        dependsOn "assemble${variant.name.capitalize()}"
+        dependsOn "bundleAppClasses${variant.name.capitalize()}"
 
         reports {
             html.enabled = true // HTML reports for humans.
             html.destination = file("$project.buildDir/reports/findbugs/findbugs-${variant.name}-output.html")
             xml.enabled = false
         }
     }
 
@@ -430,17 +430,17 @@ android.applicationVariants.all { varian
         reportLevel = "high"   // For now we only care about high priority bugs. After we have fixed
                                // the issues with medium/low priority we can lower the report level here.
         
         classes = files("$project.buildDir/intermediates/classes")
         source = variant.javaCompile.source
         classpath = variant.javaCompile.classpath
 
         excludeFilter = file("findbugs-exclude.xml")
-        dependsOn "assemble${variant.name.capitalize()}"
+        dependsOn "bundleAppClasses${variant.name.capitalize()}"
 
         reports {
             xml.enabled = true // XML reports for machines.
             xml.destination = file("$project.buildDir/reports/findbugs/findbugs-${variant.name}-output.xml")
             html.enabled = false
         }
     }
 }