summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp3
-rw-r--r--framework-jarjar-rules.txt4
2 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 4d8924d28859..6c5acd2b416b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -273,9 +273,12 @@ java_library {
installable: false,
}
+// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in
+// documentation. Do not remove without consulting the treble/hidl teams.
filegroup {
name: "framework-jarjar-rules",
srcs: ["framework-jarjar-rules.txt"],
+ visibility: ["//visibility:public"],
}
java_defaults {
diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt
index 52ee63a15a63..be21f4e87101 100644
--- a/framework-jarjar-rules.txt
+++ b/framework-jarjar-rules.txt
@@ -1,3 +1,7 @@
+# This rule is meant to be reused across libraries in the bootclasspath that depend
+# on the HIDL libraries.
rule android.hidl.** android.internal.hidl.@1
+
+# Framework-specific renames.
rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1
rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1