Merge "Use jarjar rules for framework.jar."

am: b70a6cbf9a Change-Id: I85027c5a87f9acd2c67a804bcfe8c3f7346fdbc3
2019-03-13 14:06:12 -07:00
parent 99d0681a6f b70a6cbf9a
commit 4382755210
1 changed files with 6 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -681,7 +681,7 @@ java_defaults {
        "ext",
    ],

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

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

 }

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