commit 20a1848bc061385c89c9e86a756aa448b12fa9d0
author Steven Moreland <smoreland@google.com> Thu Jan 17 12:24:54 2019 -0800
committer Steven Moreland <smoreland@google.com> Tue Jan 22 21:11:25 2019 +0000
tree f49c746c2be23592b362478eb9cca39b4a249df6
parent 03a92495474db0d1de25231b7bfbc2e2622d06e1

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

Android.bp

diff --git a/Android.bp b/Android.bp
index ab2bd9d..c6041dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -677,6 +677,8 @@
         "ext",
     ],
 
+    jarjar_rules: ":framework-hidl-jarjar",
+
     static_libs: [
         "apex_aidl_interface-java",
         "networkstack-aidl-interfaces-java",
@@ -732,6 +734,11 @@
     ],
 }
 
+filegroup {
+    name: "framework-hidl-jarjar",
+    srcs: ["jarjar_rules_hidl.txt"],
+}
+
 java_library {
     name: "framework",
     defaults: ["framework-defaults"],

jarjar_rules_hidl.txt

diff --git a/jarjar_rules_hidl.txt b/jarjar_rules_hidl.txt
new file mode 100644
index 0000000..4b2331d
--- /dev/null
+++ b/jarjar_rules_hidl.txt
@@ -0,0 +1 @@
+rule android.hidl.** android.internal.hidl.@1