Merge "Use jarjar rules for framework.jar." (43827552) · Commits · e / os / android_frameworks_base

Android.bp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -681,7 +681,7 @@ java_defaults {
	"ext",		"ext",
	],		],

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

	static_libs: [		static_libs: [
	"apex_aidl_interface-java",		"apex_aidl_interface-java",
	@@ -726,6 +726,11 @@ java_defaults {

	}		}

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

	filegroup {		filegroup {
	name: "libincident_aidl",		name: "libincident_aidl",
	srcs: [		srcs: [