summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-01-23 18:45:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-01-23 18:45:39 +0000
commitb453080f12d93a6df790066ff5f3344d136eb535 (patch)
tree90bd629283e23b2e9794d746e3c1dd2c4284d7b6
parent704fdc060996fa0d9a0eb3c8e2ac8f9bde3bab3a (diff)
parent12f1e0c4eabfcaafe3cab693017b461d118d60a8 (diff)
Merge "Merge "jarjar hidl core libs." am: 436e2ad4c7 am: 977fc9bf8e am: 00217ac44b"
-rw-r--r--Android.bp7
-rw-r--r--jarjar_rules_hidl.txt1
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index b68312b47c46..1d93ee7fe9e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -732,6 +732,8 @@ java_defaults {
"ext",
],
+ jarjar_rules: ":framework-hidl-jarjar",
+
static_libs: [
"apex_aidl_interface-java",
"networkstack-aidl-interfaces-java",
@@ -791,6 +793,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