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

media/libmedia/Android.bp

@@ -259,6 +259,7 @@ cc_library_static {
     name: "libmedia_player2_util",
 
     srcs: [
+        "AudioParameter.cpp",
         "BufferingSettings.cpp",
         "DataSourceDesc.cpp",
         "MediaCodecBuffer.cpp",

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",