Merge "Remove static linking of libstagefright and libmedia_helper from libmedia2_jni"

5 years ago · 4adca04f33
parent 06a2b7240f 03852c6738
commit 4adca04f33
2 changed files with 3 additions and 0 deletions
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@ -259,6 +259,7 @@ cc_library_static {
    name: "libmedia_player2_util",

    srcs: [
+        "AudioParameter.cpp",
        "BufferingSettings.cpp",
        "DataSourceDesc.cpp",
        "MediaCodecBuffer.cpp",
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@ -265,9 +265,11 @@ cc_library_static {
    srcs: [
        "ClearFileSource.cpp",
        "DataURISource.cpp",
+        "DataSourceBase.cpp",
        "HTTPBase.cpp",
        "HevcUtils.cpp",
        "MediaClock.cpp",
+        "MediaSource.cpp",
        "NdkUtils.cpp",
        "Utils.cpp",
        "VideoFrameSchedulerBase.cpp",