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

Commit f86a56c5 authored by Insun Kang's avatar Insun Kang Committed by Sungsoo Lim
Browse files

Add build rule for media2-abi-* 

- media2-abi-* included in updatable-media.jar
- Moves the media2-abi files into media/apex
- Resolves a hidden api usage

Bug: 123209084
Test: build
Change-Id: I9f9b0b9c288da5c7acbfedcb56867ff405ac0d61
parent 070aba8e

Android.bp

+8 −5
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ java_defaults { 
        "rs/java/**/*.java",



        ":framework-javastream-protos",

        // TODO: Remove this after introduce corresponding srcs under media/java/

        ":mediasession2-srcs",



        "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl",

        "core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl",
@@ -471,14 +473,11 @@ java_defaults { 
        "media/java/android/media/IAudioRoutesObserver.aidl",

        "media/java/android/media/IAudioService.aidl",

        "media/java/android/media/IAudioServerStateDispatcher.aidl",

        "media/java/android/media/IMediaController2.aidl",

        "media/java/android/media/IMediaHTTPConnection.aidl",

        "media/java/android/media/IMediaHTTPService.aidl",

        "media/java/android/media/IMediaResourceMonitor.aidl",

        "media/java/android/media/IMediaRouterClient.aidl",

        "media/java/android/media/IMediaRouterService.aidl",

        "media/java/android/media/IMediaSession2.aidl",

        "media/java/android/media/IMediaSession2Service.aidl",

        "media/java/android/media/IMediaScannerListener.aidl",

        "media/java/android/media/IMediaScannerService.aidl",

        "media/java/android/media/IPlaybackConfigDispatcher.aidl",
@@ -691,6 +690,7 @@ java_defaults { 
            "location/java",

            "lowpan/java",

            "media/java",

            "media/apex/java",

            "media/mca/effect/java",

            "media/mca/filterfw/java",

            "media/mca/filterpacks/java",
@@ -1271,7 +1271,8 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

        ":mediasession2-stubs-srcs",

        ":mediaplayer2-srcs",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

    ],
@@ -1333,7 +1334,8 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

        ":mediasession2-stubs-srcs",

        ":mediaplayer2-srcs",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,
@@ -1779,6 +1781,7 @@ filegroup { 
    name: "framework-media-annotation-srcs",

    srcs: [

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

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

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

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

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

media/Android.bp

+44 −2
Original line number Diff line number Diff line
@@ -15,11 +15,43 @@ filegroup { 
    ],

}



filegroup {

    name: "mediasession2-srcs",

    srcs: [

        "apex/java/android/media/Controller2Link.java",

        "apex/java/android/media/IMediaController2.aidl",

        "apex/java/android/media/IMediaSession2.aidl",

        "apex/java/android/media/IMediaSession2Service.aidl",

        "apex/java/android/media/MediaConstants.java",

        "apex/java/android/media/MediaController2.java",

        "apex/java/android/media/MediaItem2.java",

        "apex/java/android/media/MediaSession2.java",

        "apex/java/android/media/MediaSession2Service.java",

        "apex/java/android/media/Session2Command.java",

        "apex/java/android/media/Session2CommandGroup.java",

        "apex/java/android/media/Session2Link.java",

        "apex/java/android/media/Session2Token.java",

    ],

}



filegroup {

    name: "mediasession2-stubs-srcs",

    srcs: [

        ":mediasession2-srcs",

    ],

    exclude_srcs: [

        "apex/java/android/media/IMediaController2.aidl",

        "apex/java/android/media/IMediaSession2.aidl",

        "apex/java/android/media/IMediaSession2Service.aidl",

    ],

}



java_library {

    name: "updatable-media",



    srcs: [

        ":media2-srcs",

        ":mediasession2-srcs",

        ":mediaplayer2-srcs",

        ":framework-media-annotation-srcs",

    ],
@@ -27,6 +59,16 @@ java_library { 
        "mediaplayer2-protos",

    ],



    aidl: {

        export_include_dirs: [

            "apex/java",

        ],



        include_dirs: [

            "frameworks/base/core/java",

        ],

    },



    installable: true,



    // Make sure that the implementaion only relies on SDK or system APIs.
@@ -34,7 +76,7 @@ java_library { 
}



filegroup {

    name: "media2-srcs",

    name: "mediaplayer2-srcs",

    srcs: [

        "apex/java/android/media/CloseGuard.java",

        "apex/java/android/media/DataSourceCallback.java",