Merge "jarjar hidl core libs." am: 436e2ad4c7

am: 977fc9bf8e

Change-Id: I13006d1ab820171739fa680aabdd661e58cf7c34

Android.bp

@@ -676,6 +676,8 @@ java_defaults {
         "ext",
     ],
 
+    jarjar_rules: ":framework-hidl-jarjar",
+
     static_libs: [
         "apex_aidl_interface-java",
         "networkstack-aidl-interfaces-java",
@@ -730,6 +732,11 @@ filegroup {
     ],
 }
 
+filegroup {
+    name: "framework-hidl-jarjar",
+    srcs: ["jarjar_rules_hidl.txt"],
+}
+
 java_library {
     name: "framework",
     defaults: ["framework-defaults"],

jarjar_rules_hidl.txt

@@ -0,0 +1 @@
+rule android.hidl.** android.internal.hidl.@1