Skip to content

Commit

Permalink
Upgrade ASM to 9.6
Browse files Browse the repository at this point in the history 
Bug: 342332820
Test: RUN_ERROR_PRONE=true m -j96 javac-check lint-check dist
Test: art/test.py -b -r --host
Change-Id: I36a68f69af0465e5eb4bb532488b0cbdfe90a9b9
  • Loading branch information
@sbgoog
sbgoog authored and Treehugger Robot committed Jun 13, 2024
1 parent 25885af commit 155920b
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion test/1948-obsolete-const-method-handle/util-src/build-classes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion test/2034-spaces-in-SimpleName/generate-sources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/2265-const-method-type-cached/generate-sources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/2265-const-method-type-cached/javac_post.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/952-invoke-custom/generate-sources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/952-invoke-custom/javac_post.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/979-const-method-handle/generate-sources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/979-const-method-handle/javac_post.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/Android.run-test.bp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/Android.run-test.bp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 155920b

Please sign in to comment.