Merge "Use asm built from source in framework tools." am: bc0e39459f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2304515 Change-Id: Ia0943806c68112d09e06997e76543aad36b84ec4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -12,10 +12,10 @@ java_binary_host {
|
|||||||
manifest: "manifest.txt",
|
manifest: "manifest.txt",
|
||||||
srcs: ["src/**/*.java"],
|
srcs: ["src/**/*.java"],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"asm-9.2",
|
|
||||||
"asm-commons-9.2",
|
|
||||||
"asm-tree-9.2",
|
|
||||||
"asm-analysis-9.2",
|
|
||||||
"guava",
|
"guava",
|
||||||
|
"ow2-asm",
|
||||||
|
"ow2-asm-analysis",
|
||||||
|
"ow2-asm-commons",
|
||||||
|
"ow2-asm-tree",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ java_binary_host {
|
|||||||
"src/**/*.kt",
|
"src/**/*.kt",
|
||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"asm-9.2",
|
"ow2-asm",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ java_binary_host {
|
|||||||
manifest: "manifest.txt",
|
manifest: "manifest.txt",
|
||||||
srcs: ["src/**/*.java"],
|
srcs: ["src/**/*.java"],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"asm-9.2",
|
"ow2-asm",
|
||||||
"asm-commons-9.2",
|
"ow2-asm-commons",
|
||||||
"asm-tree-9.2",
|
"ow2-asm-tree",
|
||||||
"asm-analysis-9.2",
|
"ow2-asm-analysis",
|
||||||
"guava",
|
"guava",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user