diff options
| author | 2022-11-22 22:36:44 +0000 | |
|---|---|---|
| committer | 2022-11-22 22:36:44 +0000 | |
| commit | 0ddda1e5b6eb95aceed45f468dbe77ab04e6957c (patch) | |
| tree | ebddf44fb82157dd95373aa9970cc9525e6b207e | |
| parent | 96cb37ca351f8389257cecd52104b1bebd9cec0c (diff) | |
| parent | fef043d4ea9dbbe07dcf910689b895ec46722583 (diff) | |
Merge "Use asm built from source in framework tools." am: bc0e39459f am: fef043d4ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2304515
Change-Id: Ie52139694c1a94d5203b41c6201fcef1ce9709e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/locked_region_code_injection/Android.bp | 8 | ||||
| -rw-r--r-- | tools/sdkparcelables/Android.bp | 2 | ||||
| -rw-r--r-- | tools/traceinjection/Android.bp | 8 |
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", ], } |