commit c8b2c15d21486e49e44b0cb4a2e9fa584bf1fe0a
author Clément Béra <clementbera@google.com> Wed Jun 22 08:23:47 2022 +0200
committer Clément Béra <clementbera@google.com> Wed Jun 22 08:51:50 2022 +0000
tree 301cb38cf6779c7e6db7b13efdcb958d4263757e
parent e3c7dfc5504a2cf4c8f902b3b922b9a549df8c4a

Custom conversion rewrites as gradle tasks

Bug: 222647019
Change-Id: Ifdddc41a608ec11044c50923843b126672925372

build.gradle

diff --git a/build.gradle b/build.gradle
index b2e669c..50fda5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@
 
 import dx.DexMergerTask
 import dx.DxTask
+import desugaredlibrary.CustomConversionAsmRewriterTask
 import net.ltgt.gradle.errorprone.CheckSeverity
 import org.gradle.internal.os.OperatingSystem
 import smali.SmaliTask
@@ -31,7 +32,7 @@
 
 ext {
     androidSupportVersion = '25.4.0'
-    asmVersion = '9.3'  // When updating update tools/asmifier.py and Toolhelper as well.
+    asmVersion = '9.3'  // When updating update tools/asmifier.py, build.src and Toolhelper as well.
     espressoVersion = '3.0.0'
     fastutilVersion = '7.2.0'
     guavaVersion = '30.1.1-jre'
@@ -1007,11 +1008,16 @@
     }
 }
 
-task buildLibraryDesugarConversions(type: Zip, dependsOn: downloadDeps) {
+task rawBuildLibraryDesugarConversions(type: Zip, dependsOn: downloadDeps) {
     from sourceSets.libraryDesugarConversions.output
     include "java/**/*.class"
-    baseName 'library_desugar_conversions'
-    destinationDir file('build/libs')
+    baseName 'library_desugar_conversions_raw'
+    destinationDir file('build/tmp/desugaredlibrary')
+}
+
+task buildLibraryDesugarConversions(type: CustomConversionAsmRewriterTask, dependsOn: rawBuildLibraryDesugarConversions) {
+    rawJar = file("tmp/library_desugar_conversions_raw.zip")
+    outputDirectory = file("build/libs")
 }
 
 task testJarSources(type: Jar, dependsOn: [testClasses, buildLibraryDesugarConversions]) {