From 03852c673804159db10b015adedb2844f7478804 Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Mon, 25 Feb 2019 13:48:14 -0800
Subject: [PATCH] Remove static linking of libstagefright and libmedia_helper
 from libmedia2_jni

Test: build and boot
Bug: 126159708
Change-Id: Iac1b4c123a985f6f7f6f88efe320f49981c793f4
---
 media/libmedia/Android.bp       | 1 +
 media/libstagefright/Android.bp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 5853e4bd31..9799cad6e3 100644
--- 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",
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 488890da74..2bd7288eec 100644
--- 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",