commit 2a3363ad85d82a8dfa89573d0d84898cb8bb8727
author Marco Nelissen <marcone@google.com> Thu Sep 13 13:15:30 2018 -0700
committer Marco Nelissen <marcone@google.com> Fri Sep 28 16:07:44 2018 -0700
tree 3e9be93220d9925d70e82a416211bdece2d9b341
parent f7f463120abca9a0050f3e82b0ebd222410e141b

C-ify MediaTrack

Add C-API replacement for MediaTrack in extractor plugins.
Move MediaTrack from libmediaextractor.so to libmedia.so

Bug: 111407253
Test: CTS, manual

Change-Id: I3407e903fe41a2d7b7233538808281fce318c27a

media/libmediaplayer2/Android.bp

diff --git a/media/libmediaplayer2/Android.bp b/media/libmediaplayer2/Android.bp
index e30da85..2db48a4 100644
--- a/media/libmediaplayer2/Android.bp
+++ b/media/libmediaplayer2/Android.bp
@@ -4,7 +4,7 @@
     export_include_dirs: ["include"],
 }
 
-cc_library {
+cc_library_static {
     name: "libmediaplayer2",
 
     srcs: [
@@ -20,7 +20,6 @@
         "libgui",
         "liblog",
         "libmedia_omx",
-        "libmedia_player2_util",
         "libmediaextractor",
         "libstagefright_foundation",
         "libui",
@@ -35,7 +34,6 @@
         "libnativewindow",
         "libpowermanager",
         "libstagefright_httplive",
-        "libstagefright_player2",
     ],
 
     export_shared_lib_headers: [
@@ -55,8 +53,10 @@
     static_libs: [
         "libmedia_helper",
         "libmediaplayer2-protos",
+        "libmedia_player2_util",
         "libprotobuf-cpp-lite",
         "libstagefright_nuplayer2",
+        "libstagefright_player2",
         "libstagefright_rtsp",
         "libstagefright_timedtext2",
     ],