summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-03-08 10:44:22 -0800
committer Steven Moreland <smoreland@google.com> 2019-03-08 10:46:28 -0800
commit19e8d4659c4e717d4c0a256e1884c86b67a2a211 (patch)
tree0608b6c9cf11d4132ed6313121392a967d68f7f8
parent8bf13f06d71f01b79752965526cbdf598c1067fd (diff)
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
-rw-r--r--Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index b27455202ab8..db8a4def95e8 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",
@@ -723,6 +723,11 @@ java_defaults {
}
filegroup {
+ name: "framework-jarjar-rules",
+ srcs: ["jarjar_rules_hidl.txt"],
+}
+
+filegroup {
name: "libincident_aidl",
srcs: [
"core/java/android/os/IIncidentManager.aidl",