Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove custom annotation libs" am: 355f8c28b1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658119

Change-Id: I3892eeaa0b31bbef26d4599bd0f37591956a1f79
This commit is contained in:
Anton Hansson
2021-03-31 09:26:34 +00:00
committed by Automerger Merge Worker
parent 9dc77df4b6 355f8c28b1
commit a056f69a7a
2 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Android.bp
View File

@@ -755,13 +755,21 @@ gensrcs {
filegroup { filegroup {
name: "framework-annotations", name: "framework-annotations",
srcs: [ srcs: [
"core/java/android/annotation/AnyThread.java",
"core/java/android/annotation/AppIdInt.java",
"core/java/android/annotation/BytesLong.java",
"core/java/android/annotation/CallbackExecutor.java", "core/java/android/annotation/CallbackExecutor.java",
"core/java/android/annotation/CallSuper.java",
"core/java/android/annotation/CheckResult.java", "core/java/android/annotation/CheckResult.java",
"core/java/android/annotation/CurrentTimeMillisLong.java", "core/java/android/annotation/CurrentTimeMillisLong.java",
"core/java/android/annotation/CurrentTimeSecondsLong.java",
"core/java/android/annotation/DrawableRes.java",
"core/java/android/annotation/DurationMillisLong.java",
"core/java/android/annotation/Hide.java", "core/java/android/annotation/Hide.java",
"core/java/android/annotation/IntDef.java", "core/java/android/annotation/IntDef.java",
"core/java/android/annotation/IntRange.java", "core/java/android/annotation/IntRange.java",
"core/java/android/annotation/LongDef.java", "core/java/android/annotation/LongDef.java",
"core/java/android/annotation/MainThread.java",
"core/java/android/annotation/NonNull.java", "core/java/android/annotation/NonNull.java",
"core/java/android/annotation/Nullable.java", "core/java/android/annotation/Nullable.java",
"core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/RequiresPermission.java",
@@ -770,10 +778,11 @@ filegroup {
"core/java/android/annotation/SystemApi.java", "core/java/android/annotation/SystemApi.java",
"core/java/android/annotation/SystemService.java", "core/java/android/annotation/SystemService.java",
"core/java/android/annotation/TestApi.java", "core/java/android/annotation/TestApi.java",
"core/java/android/annotation/UserIdInt.java",
"core/java/android/annotation/WorkerThread.java", "core/java/android/annotation/WorkerThread.java",
"core/java/com/android/internal/annotations/GuardedBy.java", "core/java/com/android/internal/annotations/GuardedBy.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java",
"core/java/com/android/internal/annotations/Immutable.java", "core/java/com/android/internal/annotations/Immutable.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java",
], ],
} }
@@ -787,7 +796,6 @@ filegroup {
name: "framework-ike-shared-srcs", name: "framework-ike-shared-srcs",
visibility: ["//packages/modules/IPsec"], visibility: ["//packages/modules/IPsec"],
srcs: [ srcs: [
"core/java/android/annotation/StringDef.java",
"core/java/android/net/annotations/PolicyDirection.java", "core/java/android/net/annotations/PolicyDirection.java",
"core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/HexDump.java",
"core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/IState.java",
@@ -1198,28 +1206,6 @@ python_binary_host {
], ],
} }
filegroup {
name: "framework-media-annotation-srcs",
srcs: [
":framework-annotations",
"core/java/android/annotation/CallbackExecutor.java",
"core/java/android/annotation/CallSuper.java",
"core/java/android/annotation/DrawableRes.java",
"core/java/android/annotation/LongDef.java",
"core/java/android/annotation/StringDef.java",
],
}
filegroup {
name: "framework-mediaprovider-annotation-sources",
srcs: [
":framework-annotations",
"core/java/android/annotation/BytesLong.java",
"core/java/android/annotation/CurrentTimeSecondsLong.java",
"core/java/android/annotation/DurationMillisLong.java",
],
}
// Avoid including Parcelable classes as we don't want to have two copies of // Avoid including Parcelable classes as we don't want to have two copies of
// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony) // Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)
// and TeleService app (packages/services/Telephony). // and TeleService app (packages/services/Telephony).

15
apex/media/framework/Android.bp
View File

@@ -41,9 +41,7 @@ java_library {
installable: true, installable: true,
sdk_version: "module_current", sdk_version: "module_current",
libs: [ libs: ["framework-annotations-lib"],
"framework_media_annotation",
],
static_libs: [ static_libs: [
"exoplayer2-extractor" "exoplayer2-extractor"
], ],
@@ -107,20 +105,9 @@ java_sdk_library {
srcs: [ srcs: [
":updatable-media-srcs", ":updatable-media-srcs",
], ],
libs: [
"framework_media_annotation",
],
impl_library_visibility: ["//frameworks/av/apex:__subpackages__"], 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 { cc_library_shared {
name: "libmediaparser-jni", name: "libmediaparser-jni",
srcs: [ srcs: [