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 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"],