From 524bf249777f5e71d22facb9ddd86d58abab651a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 25 May 2021 12:48:58 +0100 Subject: [PATCH] Add some warnings and notes about framework's jarjar rules These rules are explicitly recommended to be depended on by other libraries in the bootclasspath, that may depend on the framework's copy of the hidl library. Bug: 186804505 Test: presubmit Change-Id: I09766423782d9bb9408f3d14169d7e5d8f1b5823 --- Android.bp | 3 +++ framework-jarjar-rules.txt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Android.bp b/Android.bp index f3888ab78b63..0d51ebb3d42f 100644 --- a/Android.bp +++ b/Android.bp @@ -271,9 +271,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