Remove custom annotation libs
Various modules were previously creating their own annotation libs
as some appeared to be missing from framework-annotations-lib. Add the
missing ones instead (they all have SOURCE retention), and delete the
custom ones.
Bug: 183133670
Test: m
Change-Id: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 20ce133..3cf585e 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -41,9 +41,7 @@
installable: true,
sdk_version: "module_current",
- libs: [
- "framework_media_annotation",
- ],
+ libs: ["framework-annotations-lib"],
static_libs: [
"exoplayer2-extractor",
"mediatranscoding_aidl_interface-java",
@@ -138,20 +136,9 @@
api_lint: {
enabled: false,
},
-
- libs: [
- "framework_media_annotation",
- ],
impl_library_visibility: ["//frameworks/av/apex:__subpackages__"],
}
-java_library {
- name: "framework_media_annotation",
- srcs: [":framework-media-annotation-srcs"],
- installable: false,
- sdk_version: "core_current",
-}
-
cc_library_shared {
name: "libmediaparser-jni",
srcs: [