From 19e8d4659c4e717d4c0a256e1884c86b67a2a211 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 8 Mar 2019 10:44:22 -0800 Subject: [PATCH] Use jarjar rules for framework.jar. Rather than copying the rules, boot libs (e.g. telephony-common or those added by OEMs) can just add the following to their library: jarjar_rules: ":framework-jarjar-rules", This will ensure that rules can be changed in framework.jar without breaking things downstream. Bug: 127875362 Test: manual Change-Id: I3dd64d418eca5302bb4aa142147040c459725e11 --- Android.bp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index b27455202ab8b..db8a4def95e8d 100644 --- a/Android.bp +++ b/Android.bp @@ -677,7 +677,7 @@ java_defaults { "ext", ], - jarjar_rules: "jarjar_rules_hidl.txt", + jarjar_rules: ":framework-jarjar-rules", static_libs: [ "apex_aidl_interface-java", @@ -722,6 +722,11 @@ java_defaults { } +filegroup { + name: "framework-jarjar-rules", + srcs: ["jarjar_rules_hidl.txt"], +} + filegroup { name: "libincident_aidl", srcs: [