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

Commit f408818a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "media-apex" 

* changes:
  Separate updatable-media library
  Move MediaBrowser API into updatable media
  Add build rule for updatable media 1.0 APIs
  Add build rule for media2-abi-*
parents b4ef1f88 64ed0093

Android.bp

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



        ":framework-javastream-protos",

        // TODO: Resolve circular library dependency and remove media1-srcs and mediasession2-srcs

        ":media1-srcs",

        ":mediasession2-srcs",



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

        "core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl",
@@ -471,14 +474,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",
@@ -504,11 +504,7 @@ java_defaults { 
        "media/java/android/media/session/ICallback.aidl",

        "media/java/android/media/session/IOnMediaKeyListener.aidl",

        "media/java/android/media/session/IOnVolumeKeyLongPressListener.aidl",

        "media/java/android/media/session/ISession.aidl",

        "media/java/android/media/session/ISession2TokensListener.aidl",

        "media/java/android/media/session/ISessionCallback.aidl",

        "media/java/android/media/session/ISessionController.aidl",

        "media/java/android/media/session/ISessionControllerCallback.aidl",

        "media/java/android/media/session/ISessionManager.aidl",

        "media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl",

        "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl",
@@ -523,8 +519,6 @@ java_defaults { 
        "media/java/android/media/tv/ITvInputSessionCallback.aidl",

        "media/java/android/media/tv/ITvRemoteProvider.aidl",

        "media/java/android/media/tv/ITvRemoteServiceInput.aidl",

        "media/java/android/service/media/IMediaBrowserService.aidl",

        "media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",

        "telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl",

        "telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl",

        "telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl",
@@ -692,6 +686,7 @@ java_defaults { 
            "location/java",

            "lowpan/java",

            "media/java",

            "media/apex/java",

            "media/mca/effect/java",

            "media/mca/filterfw/java",

            "media/mca/filterpacks/java",
@@ -1269,7 +1264,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

        ":media-srcs-without-aidls",

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

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

    ],
@@ -1331,7 +1326,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

        ":media-srcs-without-aidls",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,
@@ -1777,6 +1772,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",
@@ -1785,6 +1781,7 @@ filegroup { 
        "core/java/android/annotation/RequiresPermission.java",

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

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

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

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

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

        "core/java/com/android/internal/annotations/GuardedBy.java",

media/Android.bp

+121 −6
Original line number Diff line number Diff line 
java_library {

    name: "media1",

    name: "updatable-media1",



    srcs: [

        ":media1-srcs",

        ":framework-media-annotation-srcs",

    ],



    aidl: {

        export_include_dirs: [

            "apex/java",

        ],



        // TODO: find out a way to include only the necessary aidl files instead of dirs.

        include_dirs: [

            "frameworks/base/core/java",

            "frameworks/base/media/java",

        ],

    },



    installable: true,



    // Make sure that the implementaion only relies on SDK or system APIs.

    sdk_version: "system_current",

}



filegroup {

    name: "media1-srcs",

java_library {

    name: "updatable-mediasession2",



    srcs: [

        "java/android/media/session/MediaSessionProviderService.java",

        ":mediasession2-srcs",

        ":framework-media-annotation-srcs",

    ],



    aidl: {

        export_include_dirs: [

            "apex/java",

        ],



        // TODO: find out a way to include only the necessary aidl files instead of dirs.

        include_dirs: [

            "frameworks/base/core/java",

        ],

    },



    installable: true,



    // Make sure that the implementaion only relies on SDK or system APIs.

    sdk_version: "system_current",

}



java_library {

    name: "updatable-media",



    srcs: [

        ":media2-srcs",

        ":mediaplayer2-srcs",

        ":framework-media-annotation-srcs",

    ],
@@ -34,7 +68,88 @@ java_library { 
}



filegroup {

    name: "media2-srcs",

    name: "media-srcs-without-aidls",

    srcs : [

        ":media1-srcs-without-aidls",

        ":mediasession2-srcs-without-aidls",

        ":mediaplayer2-srcs",

    ],

}



filegroup {

    name: "media1-srcs",

    srcs: [

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

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

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

        "apex/java/android/media/browse/MediaBrowser.java",

        "apex/java/android/media/browse/MediaBrowserUtils.java",

        "apex/java/android/media/session/ControllerCallbackLink.java",

        "apex/java/android/media/session/ControllerLink.java",

        "apex/java/android/media/session/ISession.aidl",

        "apex/java/android/media/session/ISessionCallback.aidl",

        "apex/java/android/media/session/ISessionController.aidl",

        "apex/java/android/media/session/ISessionControllerCallback.aidl",

        "apex/java/android/media/session/MediaController.java",

        "apex/java/android/media/session/MediaSessionEngine.java",

        "apex/java/android/media/session/MediaSessionProviderService.java",

        "apex/java/android/media/session/PlaybackState.java",

        "apex/java/android/media/session/SessionCallbackLink.java",

        "apex/java/android/media/session/SessionLink.java",

        "apex/java/android/service/media/IMediaBrowserService.aidl",

        "apex/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",

        "apex/java/android/service/media/MediaBrowserService.java",

    ],

}



filegroup {

    name: "media1-srcs-without-aidls",

    srcs: [

        ":media1-srcs",

    ],

    exclude_srcs: [

        "apex/java/android/media/session/ISession.aidl",

        "apex/java/android/media/session/ISessionCallback.aidl",

        "apex/java/android/media/session/ISessionController.aidl",

        "apex/java/android/media/session/ISessionControllerCallback.aidl",

        "apex/java/android/service/media/IMediaBrowserService.aidl",

        "apex/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",

    ],

}



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-srcs-without-aidls",

    srcs: [

        ":mediasession2-srcs",

    ],

    exclude_srcs: [

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

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

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

    ],

}



filegroup {

    name: "mediaplayer2-srcs",

    srcs: [

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

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