commit 062e2c1130a039a741882d7b9c2c76c1208aa09d
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Jun 26 11:18:13 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Jun 26 10:24:52 2023 +0000
tree 20ee419c2da35a76774b25cb870ee322bec14134
parent 249f0ffd2d8a00e0b651cfe0d886de6d889988ce

Move smali examples to third_party

Bug: b/270105162
Change-Id: Ie06b6e49c457a9e0673a11fea286d106305f5e6b

build.gradle

diff --git a/build.gradle b/build.gradle
index a4752c4..332b74a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@
 import desugaredlibrary.CustomConversionAsmRewriterTask
 import net.ltgt.gradle.errorprone.CheckSeverity
 import org.gradle.internal.os.OperatingSystem
-import smali.SmaliTask
 import tasks.DownloadDependency
 import tasks.GetJarsFromConfiguration
 
@@ -372,6 +371,7 @@
                 "r8-releases/2.0.74",
                 "r8-releases/3.2.54",
                 "r8mappings",
+                "smali",
                 "tachiyomi"
         ],
         // All dex-vms have a fixed OS of Linux, as they are only supported on Linux, and will be run in a Docker
@@ -1632,53 +1632,6 @@
     }
 }
 
-task buildSmali {
-    def smaliDir = file("src/test/smali")
-    smaliDir.eachDirRecurse() { dir ->
-        def name = dir.getName();
-        def relativeDir = smaliDir.toPath().relativize(dir.toPath());
-        def smaliOutputDir = file("build/test/smali/" + relativeDir);
-        smaliOutputDir.mkdirs()
-        outputs.dir smaliOutputDir
-        def taskName = "smali_build_${relativeDir.toString().replace('/', '_').replace('\\', '_')}"
-        def smaliFiles = fileTree(dir: dir, include: '*.smali')
-        def javaFiles = fileTree(dir: dir, include: '*.java')
-        def destDir = smaliOutputDir;
-        def destFile = destDir.toPath().resolve("${name}.dex").toFile()
-        def intermediateFileName = "${name}-intermediate.dex";
-        def intermediateFile = destDir.toPath().resolve(intermediateFileName).toFile()
-        if (javaFiles.empty) {
-            if (!smaliFiles.empty) {
-                dependsOn "${taskName}_smali"
-                task "${taskName}_smali"(type: SmaliTask) {
-                    source = smaliFiles
-                    destination = destFile
-                }
-            }
-        } else {
-            dependsOn "${taskName}_smali"
-            dependsOn "${taskName}_jar"
-            task "${taskName}_smali"(type: SmaliTask) {
-                source = smaliFiles
-                destination = destFile
-            }
-            task "${taskName}_java"(type: JavaCompile) {
-                source = javaFiles
-                destinationDir destDir
-                classpath = sourceSets.main.compileClasspath
-                sourceCompatibility = JavaVersion.VERSION_1_7
-                targetCompatibility = JavaVersion.VERSION_1_7
-                options.compilerArgs += ["-Xlint:-options"]
-            }
-            task "${taskName}_jar"(type: Jar, dependsOn: "${taskName}_java") {
-                archiveName = "Test.jar"
-                destinationDir = destDir
-                from fileTree(dir: destDir, include: 'Test.class')
-            }
-        }
-    }
-}
-
 tasks.withType(Test) {
     println("NOTE: Number of processors " + Runtime.runtime.availableProcessors())
     def userDefinedCoresPerFork = System.getenv('R8_GRADLE_CORES_PER_FORK')
@@ -2282,7 +2235,6 @@
         dependsOn downloadDeps
         dependsOn buildExamples
         dependsOn buildKotlinR8TestResources
-        dependsOn buildSmali
         dependsOn buildPreNJdwpTestsJar
         dependsOn compileTestNGRunner
         dependsOn provideArtFrameworksDependencies