diff options
| author | 2022-01-18 19:02:17 +0000 | |
|---|---|---|
| committer | 2022-01-18 19:02:17 +0000 | |
| commit | bb9501d2a2f040d9077fc352cde9ecd5eca48e0f (patch) | |
| tree | 34597a1c9b2ffe8ca9b8c06446b175a91cbd5f15 | |
| parent | 461e6477ba9c672b117a32669678c6cf86a235cc (diff) | |
| parent | e00127f167450049c98cf6cb7c0c03ce4a85e806 (diff) | |
Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87 am: 3a0e798ed9 am: 1b91eb3165 am: e00127f167
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689
Change-Id: I4a3359e821d32b09459aa36cab4f114870cdbbba
| -rw-r--r-- | tools/sdkparcelables/Android.bp | 2 | ||||
| -rw-r--r-- | tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/sdkparcelables/Android.bp b/tools/sdkparcelables/Android.bp index 9d773e44faea..ec2bffdfaf57 100644 --- 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", ], } diff --git a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt index 22e8d781335b..0fb062f280e3 100644 --- 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")) { |