Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 478a9a15 authored Nov 23, 2022 by Treehugger Robot Committed by Automerger Merge Worker Nov 23, 2022

Merge "Use asm built from source in framework tools." am: bc0e3945 am: fef043d4 am: 0ddda1e5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2304515

Change-Id: Id7a17efce6a770ac4eace59945142761ca803c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c4303e55 0ddda1e5

tools/locked_region_code_injection/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -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",
		],
		}

tools/sdkparcelables/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ java_binary_host {
		"src/*/.kt",
		],
		static_libs: [
		"asm-9.2",
		"ow2-asm",
		],
		}

tools/traceinjection/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -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",
		],
		}