Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a19d2748 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add some warnings and notes about framework's jarjar rules" into sc-dev am: c8863205 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703099

Change-Id: Ia5068d27c1d5bf6158053ca327b14b4227effd7d
parents b0b56e6e c8863205

Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -273,9 +273,12 @@ java_library { 
    installable: false,

    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 {

filegroup {

    name: "framework-jarjar-rules",

    name: "framework-jarjar-rules",

    srcs: ["framework-jarjar-rules.txt"],

    srcs: ["framework-jarjar-rules.txt"],

    visibility: ["//visibility:public"],

}

}





java_defaults {

java_defaults {

framework-jarjar-rules.txt

+4 −0
Original line number Original line Diff line number Diff line 
# 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

rule android.hidl.** android.internal.hidl.@1



# Framework-specific renames.

rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1

rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1

rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1
 
rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1