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

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

Merge changes from topic "mv_jar" 

* changes:
  Include updatable-media.jar in bootclasspath & apex
  Separate out mediaplayer2 code from framework
parents 2e2692d3 0d035539

Android.bp

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

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

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

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

    ],
@@ -1314,6 +1315,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media2-srcs",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,

core/jni/fd_utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
// Static whitelist of open paths that the zygote is allowed to keep open.

static const char* kPathWhitelist[] = {

  "/apex/com.android.conscrypt/javalib/conscrypt.jar",

  "/apex/com.android.media/javalib/updatable-media.jar",

  "/dev/null",

  "/dev/socket/zygote",

  "/dev/socket/zygote_secondary",

media/Android.bp

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



java_library {

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

    name: "media2",

    name: "updatable-media",



    srcs: [

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

    ],



    installable: true,



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

    sdk_version: "system_current",

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

    name: "media2-srcs",

    srcs: [

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    ],

}