Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a am: 4382755210 (090f646c) · Commits · e / os / android_frameworks_base

Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ java_defaults {
		"updatable_media_stubs",
		],

		jarjar_rules: "jarjar_rules_hidl.txt",
		jarjar_rules: ":framework-jarjar-rules",

		static_libs: [
		"apex_aidl_interface-java",
		@@ -788,6 +788,11 @@ java_defaults {
		plugins: ["view-inspector-annotation-processor"],
		}

		filegroup {
		name: "framework-jarjar-rules",
		srcs: ["jarjar_rules_hidl.txt"],
		}

		filegroup {
		name: "libincident_aidl",
		srcs: [