Upgrade ASM to 9.6

Bug: 342332820
Test: RUN_ERROR_PRONE=true m -j96 javac-check lint-check dist
Test: art/test.py -b -r --host
Change-Id: I36a68f69af0465e5eb4bb532488b0cbdfe90a9b9

10 files changed, 12 insertions, 12 deletions

diff --git a/test/1948-obsolete-const-method-handle/util-src/build-classes b/test/1948-obsolete-const-method-handle/util-src/build-classes
index eae5b4794b..98b1d55e86 100755
--- a/test/1948-obsolete-const-method-handle/util-src/build-classes
+++ b/test/1948-obsolete-const-method-handle/util-src/build-classes
@@ -24,7 +24,7 @@ if [[ -z "${ANDROID_BUILD_TOP}" ]]; then
 fi
 
 SCRIPT_PATH=$( cd $(dirname $0) ; pwd -P )
-ASM_CLASSPATH="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+ASM_CLASSPATH="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 SRC_PATH="${SCRIPT_PATH}/src"
 BUILD_PATH="${1:-${SCRIPT_PATH}/classes}"
 
diff --git a/test/2034-spaces-in-SimpleName/generate-sources b/test/2034-spaces-in-SimpleName/generate-sources
index 2e921a75eb..5861f8d014 100755
--- a/test/2034-spaces-in-SimpleName/generate-sources
+++ b/test/2034-spaces-in-SimpleName/generate-sources
@@ -17,7 +17,7 @@
 # Stop on failure
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # generate Java bytecode with ASM
 cd src_gen
diff --git a/test/2265-const-method-type-cached/generate-sources b/test/2265-const-method-type-cached/generate-sources
index 85448d47da..9c608888ab 100755
--- a/test/2265-const-method-type-cached/generate-sources
+++ b/test/2265-const-method-type-cached/generate-sources
@@ -17,7 +17,7 @@
 # make us exit on a failure
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Build the transformer to apply to compiled classes.
 mkdir classes
diff --git a/test/2265-const-method-type-cached/javac_post.sh b/test/2265-const-method-type-cached/javac_post.sh
index cd62e69137..fb95402857 100755
--- a/test/2265-const-method-type-cached/javac_post.sh
+++ b/test/2265-const-method-type-cached/javac_post.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Move original classes to intermediate location.
 mv classes intermediate-classes
diff --git a/test/952-invoke-custom/generate-sources b/test/952-invoke-custom/generate-sources
index 4244f8ce8f..a61575b7f4 100755
--- a/test/952-invoke-custom/generate-sources
+++ b/test/952-invoke-custom/generate-sources
@@ -17,7 +17,7 @@
 # Stop on failure.
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Build the transformer to apply to compiled classes.
 mkdir classes
diff --git a/test/952-invoke-custom/javac_post.sh b/test/952-invoke-custom/javac_post.sh
index be5d8cfda3..888c1a418e 100755
--- a/test/952-invoke-custom/javac_post.sh
+++ b/test/952-invoke-custom/javac_post.sh
@@ -16,7 +16,7 @@
 
 set -e # Stop on error - the caller script may not have this set.
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Move original classes to intermediate location.
 mv classes intermediate-classes
diff --git a/test/979-const-method-handle/generate-sources b/test/979-const-method-handle/generate-sources
index 0cd94d1fd7..387882164a 100755
--- a/test/979-const-method-handle/generate-sources
+++ b/test/979-const-method-handle/generate-sources
@@ -17,7 +17,7 @@
 # make us exit on a failure
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Build the transformer to apply to compiled classes.
 mkdir classes
diff --git a/test/979-const-method-handle/javac_post.sh b/test/979-const-method-handle/javac_post.sh
index 1be31d5b8e..5089b52fe7 100755
--- a/test/979-const-method-handle/javac_post.sh
+++ b/test/979-const-method-handle/javac_post.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.2.jar"
+export ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-9.6.jar"
 
 # Move original classes to intermediate location.
 mv classes intermediate-classes
diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index 78b8c98b72..4bbeb4a1b7 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -1943,7 +1943,7 @@ genrule_defaults {
         "jvmti-common/*.java",
         "utils/python/**/*.py",
         ":development_docs",
-        ":asm-9.2-filegroup",
+        ":asm-9.6-filegroup",
         ":ojluni-AbstractCollection",
         "988-method-trace/expected-stdout.txt",
         "988-method-trace/expected-stderr.txt",
@@ -4338,7 +4338,7 @@ genrule_defaults {
         "jvmti-common/*.java",
         "utils/python/**/*.py",
         ":development_docs",
-        ":asm-9.2-filegroup",
+        ":asm-9.6-filegroup",
         ":ojluni-AbstractCollection",
         "988-method-trace/expected-stdout.txt",
         "988-method-trace/expected-stderr.txt",
@@ -6733,7 +6733,7 @@ genrule_defaults {
         "jvmti-common/*.java",
         "utils/python/**/*.py",
         ":development_docs",
-        ":asm-9.2-filegroup",
+        ":asm-9.6-filegroup",
         ":ojluni-AbstractCollection",
         "988-method-trace/expected-stdout.txt",
         "988-method-trace/expected-stderr.txt",
diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index 2f1dfb8e2a..ac121127e1 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -108,7 +108,7 @@ def main():
                 "jvmti-common/*.java",
                 "utils/python/**/*.py",
                 ":development_docs",
-                ":asm-9.2-filegroup",
+                ":asm-9.6-filegroup",
                 ":ojluni-AbstractCollection",
                 "988-method-trace/expected-stdout.txt",
                 "988-method-trace/expected-stderr.txt",