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

Commit 8afd5319 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Separate out mediaplayer2 code from framework 

"media2.jar" is renamed to "updatable-media.jar" in order to
show its purpose clearly.

Test: build & boot & MediaPlayer2Test
Bug: 112766913
Change-Id: Ia2ea05e0ed1a8bb2cfea20c9e2585e3d3cbfffd9
parent 51d41479

Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -1255,6 +1255,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":conscrypt_public_api_files",

        ":media2-srcs",

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

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

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

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

    ],

    ],
@@ -1316,6 +1317,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":conscrypt_public_api_files",

        ":media2-srcs",

    ],

    ],

    srcs_lib: "framework",

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,

media/Android.bp

+18 −16
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ filegroup { 
}

}





java_library {

java_library {

    // TODO: include media2.jar in the media apex and add it to the bootclasspath.

    // TODO: include updatable-media.jar in the media apex and add it to the bootclasspath.

    name: "media2",

    name: "updatable-media",





    srcs: [

    srcs: [

        ":media2-srcs",

        ":media2-srcs",
@@ -28,6 +28,8 @@ java_library { 
        "mediaplayer2-protos",

        "mediaplayer2-protos",

    ],

    ],





    installable: true,



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

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

    sdk_version: "system_current",

    sdk_version: "system_current",

}

}
@@ -35,19 +37,19 @@ java_library { 
filegroup {

filegroup {

    name: "media2-srcs",

    name: "media2-srcs",

    srcs: [

    srcs: [

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

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

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

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

        "java/android/media/DataSourceDesc.java",

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

        "java/android/media/UriDataSourceDesc.java",

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

        "java/android/media/FileDataSourceDesc.java",

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

        "java/android/media/CallbackDataSourceDesc.java",

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

        "java/android/media/VideoSize.java",

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

        "java/android/media/Media2Utils.java",

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

        "java/android/media/MediaPlayer2Utils.java",

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

        "java/android/media/MediaPlayer2.java",

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

        "java/android/media/Media2HTTPService.java",

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

        "java/android/media/Media2HTTPConnection.java",

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

        "java/android/media/RoutingDelegate.java",

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

        "java/android/media/BufferingParams.java",

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

    ],

    ],

}
 
}