diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index e63463c07313..8a2089f8c8e6 100644 --- a/Android.bp +++ b/Android.bp @@ -732,10 +732,13 @@ java_defaults { "ext", ], + jarjar_rules: ":framework-hidl-jarjar", + static_libs: [ "apex_aidl_interface-java", "networkstack-aidl-interfaces-java", "framework-protos", + "game-driver-protos", "mediaplayer2-protos", "android.hidl.base-V1.0-java", "android.hardware.cas-V1.0-java", @@ -748,6 +751,7 @@ java_defaults { "android.hardware.tv.input-V1.0-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", + "android.hardware.usb-V1.2-java-constants", "android.hardware.vibrator-V1.0-java", "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", @@ -790,6 +794,11 @@ filegroup { ], } +filegroup { + name: "framework-hidl-jarjar", + srcs: ["jarjar_rules_hidl.txt"], +} + java_library { name: "framework", defaults: ["framework-defaults"], @@ -800,11 +809,7 @@ java_library { name: "framework-annotation-proc", defaults: ["framework-defaults"], // Use UsedByApps annotation processor - annotation_processors: ["unsupportedappusage-annotation-processor"], - // b/25860419: annotation processors must be explicitly specified for grok - annotation_processor_classes: [ - "android.processor.unsupportedappusage.UsedByAppsProcessor", - ], + plugins: ["unsupportedappusage-annotation-processor"], } // A host library including just UnsupportedAppUsage.java so that the annotation |