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

Commit fef043d4 authored Nov 22, 2022 by Treehugger Robot Committed by Automerger Merge Worker Nov 22, 2022

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

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>

parents d14460ea bc0e3945

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",
		],
		}