Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a am: 4382755210

am: bcf1be1c91 Change-Id: Ib5402b555f789e5958e41dd702a9c02400e88d60
2019-03-13 14:31:17 -07:00
parent 18e595fb96 bcf1be1c91
commit 090f646c10
1 changed files with 6 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -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: [