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

Commit f5c65465 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
Merged-In: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
Change-Id: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
parent e492ec43

Android.bp

+10 −24
Original line number Diff line number Diff line
@@ -755,13 +755,21 @@ gensrcs { 
filegroup {

    name: "framework-annotations",

    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/CallSuper.java",

        "core/java/android/annotation/CheckResult.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/IntDef.java",

        "core/java/android/annotation/IntRange.java",

        "core/java/android/annotation/LongDef.java",

        "core/java/android/annotation/MainThread.java",

        "core/java/android/annotation/NonNull.java",

        "core/java/android/annotation/Nullable.java",

        "core/java/android/annotation/RequiresPermission.java",
@@ -770,10 +778,11 @@ filegroup { 
        "core/java/android/annotation/SystemApi.java",

        "core/java/android/annotation/SystemService.java",

        "core/java/android/annotation/TestApi.java",

        "core/java/android/annotation/UserIdInt.java",

        "core/java/android/annotation/WorkerThread.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/VisibleForTesting.java",

    ],

}
@@ -787,7 +796,6 @@ filegroup { 
    name: "framework-ike-shared-srcs",

    visibility: ["//packages/modules/IPsec"],

    srcs: [

        "core/java/android/annotation/StringDef.java",

        "core/java/android/net/annotations/PolicyDirection.java",

        "core/java/com/android/internal/util/HexDump.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

// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)

// and TeleService app (packages/services/Telephony).

apex/media/framework/Android.bp

+1 −14
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ java_library { 
    installable: true,



    sdk_version: "module_current",

    libs: [

        "framework_media_annotation",

    ],

    libs: ["framework-annotations-lib"],

    static_libs: [

        "exoplayer2-extractor"

    ],
@@ -107,20 +105,9 @@ java_sdk_library { 
    srcs: [

        ":updatable-media-srcs",

    ],



    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: [