Merge "Rename nano prot classes to avoid conflict" into main (b0d259e2) · Commits · e / os / android_frameworks_base

Ravenwood.bp

+8 −5

Original line number	Diff line number	Diff line
		@@ -225,12 +225,15 @@ java_library {

		// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.
		// Rename some of the dependencies to make sure they're included in the intended order.
		java_genrule {
		// Also apply jarjar.
		java_library {
		name: "100-framework-minus-apex.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":framework-minus-apex.ravenwood"],
		out: ["100-framework-minus-apex.ravenwood.jar"],
		defaults: ["ravenwood-internal-only-visibility-java"],
		static_libs: [
		"framework-minus-apex.ravenwood",
		],
		sdk_version: "core_platform",
		jarjar_rules: ":ravenwood-framework-jarjar-rules",
		}

		java_genrule {

+6 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,12 @@ java_device_for_host {
		],
		}

		filegroup {
		name: "ravenwood-framework-jarjar-rules",
		srcs: ["texts/ravenwood-framework-jarjar-rules.txt"],
		visibility: ["//frameworks/base"],
		}

		filegroup {
		name: "ravenwood-services-jarjar-rules",
		srcs: ["texts/ravenwood-services-jarjar-rules.txt"],

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@ android_ravenwood_test {
		"androidx.annotation_annotation",
		"androidx.test.ext.junit",
		"androidx.test.rules",

		// To make sure it won't cause VerifyError (b/324063814)
		"platformprotosnano",
		],
		srcs: [
		"test/*/.java",

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		# To avoid VerifyError on nano proto files (b/324063814)
		rule com..nano. devicenano.@0