summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Krzysztof Kosiński <krzysio@google.com> 2022-11-16 19:04:24 +0000
committer Krzysztof Kosiński <krzysio@google.com> 2022-11-16 19:04:24 +0000
commitf346762e6f0970999454bc424ac2cbc7461ef841 (patch)
tree0eae1edc9fd172b97d63fe5eb81fe4fd8650548c
parent8ea0d57f8df7bba4f1037fb9c499fde067a3ac62 (diff)
Use asm built from source in framework tools.
Bug: 259136464 Test: presubmit Change-Id: I804c89def0512e948e80672f94ff936d11a1ee27
-rw-r--r--tools/locked_region_code_injection/Android.bp8
-rw-r--r--tools/sdkparcelables/Android.bp2
-rw-r--r--tools/traceinjection/Android.bp8
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/locked_region_code_injection/Android.bp b/tools/locked_region_code_injection/Android.bp
index ff1f8e2c9d30..a0cc446cd42d 100644
--- a/tools/locked_region_code_injection/Android.bp
+++ b/tools/locked_region_code_injection/Android.bp
@@ -12,10 +12,10 @@ java_binary_host {
manifest: "manifest.txt",
srcs: ["src/**/*.java"],
static_libs: [
- "asm-9.2",
- "asm-commons-9.2",
- "asm-tree-9.2",
- "asm-analysis-9.2",
"guava",
+ "ow2-asm",
+ "ow2-asm-analysis",
+ "ow2-asm-commons",
+ "ow2-asm-tree",
],
}
diff --git a/tools/sdkparcelables/Android.bp b/tools/sdkparcelables/Android.bp
index 6ebacd8a0b14..6503a1f3a5f8 100644
--- a/tools/sdkparcelables/Android.bp
+++ b/tools/sdkparcelables/Android.bp
@@ -14,7 +14,7 @@ java_binary_host {
"src/**/*.kt",
],
static_libs: [
- "asm-9.2",
+ "ow2-asm",
],
}
diff --git a/tools/traceinjection/Android.bp b/tools/traceinjection/Android.bp
index bb32df6c65af..d627fb99d882 100644
--- a/tools/traceinjection/Android.bp
+++ b/tools/traceinjection/Android.bp
@@ -12,10 +12,10 @@ java_binary_host {
manifest: "manifest.txt",
srcs: ["src/**/*.java"],
static_libs: [
- "asm-9.2",
- "asm-commons-9.2",
- "asm-tree-9.2",
- "asm-analysis-9.2",
+ "ow2-asm",
+ "ow2-asm-commons",
+ "ow2-asm-tree",
+ "ow2-asm-analysis",
"guava",
],
}