Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689 Change-Id: I55c1cd02960b6fae7dbea7c714b94b992f9d367b
2022-01-18 18:10:58 +00:00
parent ea1c39cede e0029a5a87
commit 3a0e798ed9
2 changed files with 2 additions and 2 deletions
--- a/tools/sdkparcelables/Android.bp
+++ b/tools/sdkparcelables/Android.bp
@@ -14,7 +14,7 @@ java_binary_host {
        "src/**/*.kt",
    ],
    static_libs: [
-        "asm-6.0",
+        "asm-7.0",
    ],
 }

--- a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
+++ b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
@@ -39,7 +39,7 @@ fun main(args: Array<String>) {
        kotlin.system.exitProcess(2)
    }

-    val ancestorCollector = AncestorCollector(Opcodes.ASM6, null)
+    val ancestorCollector = AncestorCollector(Opcodes.ASM7, null)

    for (entry in zipFile.entries()) {
        if (entry.name.endsWith(".class")) {