OSDN Git Service

jarjar hidl core libs.
authorSteven Moreland <smoreland@google.com>
Thu, 17 Jan 2019 20:24:54 +0000 (12:24 -0800)
committerSteven Moreland <smoreland@google.com>
Tue, 22 Jan 2019 21:11:25 +0000 (21:11 +0000)
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
jarjar_rules_hidl.txt [new file with mode: 0644]

index ab2bd9d..c6041dd 100644 (file)
@@ -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 (file)
index 0000000..4b2331d
--- /dev/null
@@ -0,0 +1 @@
+rule android.hidl.** android.internal.hidl.@1