Merge pull request #141 from gradle/no/disable-merge-native-libs

Disable caching for MergeNativeLibs.

Author: ghale

src/main/groovy/org/gradle/android/AndroidCacheFixPlugin.groovy

@@ -9,7 +9,6 @@ import com.google.common.collect.ImmutableList
 import groovy.transform.CompileStatic
 import org.gradle.android.workarounds.CompileLibraryResourcesWorkaround_4_0
 import org.gradle.android.workarounds.CompilerArgsProcessor
-import org.gradle.android.workarounds.DexFileDependenciesWorkaround
 import org.gradle.android.workarounds.MergeJavaResourcesWorkaround
 import org.gradle.android.workarounds.MergeNativeLibsWorkaround
 import org.gradle.android.workarounds.MergeResourcesWorkaround
@@ -89,8 +88,7 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
                 new RoomSchemaLocationWorkaround(),
                 new CompileLibraryResourcesWorkaround_4_0(),
                 new CompileLibraryResourcesWorkaround_4_2(),
-                new MergeResourcesWorkaround(),
-                new DexFileDependenciesWorkaround()
+                new MergeResourcesWorkaround()
             )
         } else {
             return Collections.emptyList()

src/main/groovy/org/gradle/android/workarounds/DexFileDependenciesWorkaround.groovy

@@ -2,37 +2,19 @@ package org.gradle.android.workarounds
 
 import com.android.build.gradle.internal.tasks.MergeNativeLibsTask
 import org.gradle.android.AndroidIssue
-import org.gradle.api.Task
-import org.gradle.api.file.FileCollection
-
-import java.lang.reflect.Field
-
-/**
- * Fixes the cacheability issue with MergeNativeLibsTask where the projectNativeLibs field is treated as an input with
- * absolute path sensitivity.  This mostly comes up when either native libraries are built with the application
- * or RenderScript files are compiled as part of the build.
- *
- * In 3.5.x, projectNativeLibs is not directly backed by state in the Task object.  Instead, it is effectively a
- * method that calculates a new FileCollection from variantScope every time it is called.  So we only
- * support this workaround for 3.6.x and 4.0.x.
- */
-@AndroidIssue(introducedIn = "3.6.0", fixedIn = ["4.1.0-alpha09"], link = "https://issuetracker.google.com/issues/140602655")
-class MergeNativeLibsWorkaround extends AbstractAbsolutePathWorkaround {
-    Class<?> androidTaskClass = MergeNativeLibsTask.class
-    String propertyName = "projectNativeLibs"
+import org.gradle.api.Project
 
+@AndroidIssue(introducedIn = "3.5.0", fixedIn = [], link = "https://issuetracker.google.com/issues/153088766")
+class MergeNativeLibsWorkaround implements Workaround {
     @Override
     void apply(WorkaroundContext context) {
-        super.apply(context)
+        context.project.tasks.withType(MergeNativeLibsTask).configureEach {
+            outputs.doNotCacheIf("Caching MergeNativeLibs is unlikely to provide positive performance results.", {true })
+        }
     }
 
-    public void setPropertyValue(Task task, FileCollection fileCollection) {
-        // The projectNativeLibs input is a decorated field without a setter in 3.6.x and 4.0.x
-        Field field = task.class.getDeclaredFields().find { it.name == "__${propertyName}__" }
-
-        if (field != null) {
-            field.setAccessible(true)
-            field.set(task, fileCollection)
-        }
+    @Override
+    boolean canBeApplied(Project project) {
+        return true
     }
 }

src/main/groovy/org/gradle/android/workarounds/MergeNativeLibsWorkaround.groovy

@@ -418,16 +418,16 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
         builder.expect(':app:dexBuilderRelease', FROM_CACHE)
         builder.expect(':app:extractDeepLinksDebug', FROM_CACHE)
         builder.expect(':app:extractDeepLinksRelease', FROM_CACHE)
-        builder.expect(':app:mergeDebugNativeLibs', FROM_CACHE)
-        builder.expect(':app:mergeReleaseNativeLibs', FROM_CACHE)
+        builder.expect(':app:mergeDebugNativeLibs', SUCCESS)
+        builder.expect(':app:mergeReleaseNativeLibs', SUCCESS)
         builder.expect(':library:copyDebugJniLibsProjectAndLocalJars', FROM_CACHE)
         builder.expect(':library:copyDebugJniLibsProjectOnly', FROM_CACHE)
         builder.expect(':library:copyReleaseJniLibsProjectAndLocalJars', FROM_CACHE)
         builder.expect(':library:copyReleaseJniLibsProjectOnly', FROM_CACHE)
         builder.expect(':library:extractDeepLinksDebug', FROM_CACHE)
         builder.expect(':library:extractDeepLinksRelease', FROM_CACHE)
-        builder.expect(':library:mergeDebugNativeLibs', FROM_CACHE)
-        builder.expect(':library:mergeReleaseNativeLibs', FROM_CACHE)
+        builder.expect(':library:mergeDebugNativeLibs', SUCCESS)
+        builder.expect(':library:mergeReleaseNativeLibs', SUCCESS)
         builder.expect(':library:parseDebugLocalResources', FROM_CACHE)
         builder.expect(':library:parseReleaseLocalResources', FROM_CACHE)
         builder.expect(':library:syncDebugLibJars', FROM_CACHE)
@@ -492,8 +492,8 @@ class CrossVersionOutcomeAndRelocationTest extends AbstractTest {
     }
 
     static void android42xOrHigherExpectations(ExpectedOutcomeBuilder builder) {
-        builder.expect(':app:desugarDebugFileDependencies', FROM_CACHE)
-        builder.expect(':app:desugarReleaseFileDependencies', FROM_CACHE)
+        builder.expect(':app:desugarDebugFileDependencies', SUCCESS)
+        builder.expect(':app:desugarReleaseFileDependencies', SUCCESS)
         // Renamed from ToJar to ToDir
         builder.expect(':library:bundleLibRuntimeToDirDebug', FROM_CACHE)
         builder.expect(':library:bundleLibRuntimeToDirRelease', FROM_CACHE)

src/test/groovy/org/gradle/android/CrossVersionOutcomeAndRelocationTest.groovy

@@ -13,10 +13,10 @@ class WorkaroundTest extends Specification {
         workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
         where:
         androidVersion  | expectedWorkarounds
-        "4.2.0-beta04" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'DexFileDependencies']
-        "4.1.2"  | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
-        "4.0.2"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'DexFileDependencies']
-        "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'DexFileDependencies']
-        "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'DexFileDependencies']
+        "4.2.0-beta04" | ['RoomSchemaLocation', 'CompileLibraryResources_4_2', 'MergeResources', 'MergeNativeLibs']
+        "4.1.2"         | ['RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources', 'MergeNativeLibs']
+        "4.0.2"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation', 'CompileLibraryResources_4_0', 'MergeResources']
+        "3.6.4"         | ['MergeJavaResources', 'MergeNativeLibs', 'RoomSchemaLocation']
+        "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'MergeNativeLibs']
     }
 }