From: Steven Moreland <smoreland@google.com>
Date: Thu, 17 Jan 2019 20:24:54 +0000 (-0800)
Subject: jarjar hidl core libs.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20a1848bc061385c89c9e86a756aa448b12fa9d0;p=android-x86%2Fframeworks-base.git

jarjar hidl core libs.

Otherwise, these might conflict with priv-apps that use them.

Bug: 86259915
Test: boot Pixel 2/3, look for relevant logs

Change-Id: I5f088303ba33cc2d641eea622dcdca2a642a7cd2
---

diff --git a/Android.bp b/Android.bp
index ab2bd9d98a6b..c6041dd1d239 100644
--- a/Android.bp
+++ b/Android.bp
@@ -677,6 +677,8 @@ java_defaults {
         "ext",
     ],
 
+    jarjar_rules: ":framework-hidl-jarjar",
+
     static_libs: [
         "apex_aidl_interface-java",
         "networkstack-aidl-interfaces-java",
@@ -732,6 +734,11 @@ filegroup {
     ],
 }
 
+filegroup {
+    name: "framework-hidl-jarjar",
+    srcs: ["jarjar_rules_hidl.txt"],
+}
+
 java_library {
     name: "framework",
     defaults: ["framework-defaults"],
diff --git a/jarjar_rules_hidl.txt b/jarjar_rules_hidl.txt
new file mode 100644
index 000000000000..4b2331db7c34
--- /dev/null
+++ b/jarjar_rules_hidl.txt
@@ -0,0 +1 @@
+rule android.hidl.** android.internal.hidl.@1