From e95eaf7f5a94b723ae6597f79a42cd05de323ede Mon Sep 17 00:00:00 2001
From: Sorin Basca <sorinbasca@google.com>
Date: Wed, 12 Jan 2022 21:11:52 +0000
Subject: Setting ASM to version 7 in sdkparcelables

This is needed when using Java 11 as target.

Test: m
Bug: 195387473
Change-Id: I18abbdfee4039f9a366070b730930396ff4c210e
---
 tools/sdkparcelables/Android.bp                             | 2 +-
 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")) {
-- 
cgit v1.2.3-59-g8ed1b