commit 03852c673804159db10b015adedb2844f7478804
author Dongwon Kang <dwkang@google.com> Mon Feb 25 13:48:14 2019 -0800
committer Dongwon Kang <dwkang@google.com> Mon Feb 25 14:25:51 2019 -0800
tree e92e6bc6f876fdaaa07c2975d0e34a7ffe38d5f5
parent ea69bfb0f5b3fc247882355b919a3076e4992694

Remove static linking of libstagefright and libmedia_helper from libmedia2_jni

Test: build and boot
Bug: 126159708
Change-Id: Iac1b4c123a985f6f7f6f88efe320f49981c793f4

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 5853e4b..9799cad 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -259,6 +259,7 @@
     name: "libmedia_player2_util",
 
     srcs: [
+        "AudioParameter.cpp",
         "BufferingSettings.cpp",
         "DataSourceDesc.cpp",
         "MediaCodecBuffer.cpp",

media/libstagefright/Android.bp

diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 488890d..2bd7288 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -265,9 +265,11 @@
     srcs: [
         "ClearFileSource.cpp",
         "DataURISource.cpp",
+        "DataSourceBase.cpp",
         "HTTPBase.cpp",
         "HevcUtils.cpp",
         "MediaClock.cpp",
+        "MediaSource.cpp",
         "NdkUtils.cpp",
         "Utils.cpp",
         "VideoFrameSchedulerBase.cpp",