From c3c31a5382af607380ebd5f4209e62fdf1eb45c6 Mon Sep 17 00:00:00 2001
From: Wei Jia <wjia@google.com>
Date: Mon, 5 Feb 2018 16:18:27 -0800
Subject: [PATCH] MediaPlayer2: move MediaPlayer2 native code to
 libmediaplayer2

Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ie674b01b6e839d5ca0af76d8b712c395da64b57a
---
 media/jni/Android.bp                     | 2 +-
 media/jni/android_media_MediaPlayer2.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 7e5f581dd1c6..fe2f64fa2d96 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -127,11 +127,11 @@ cc_library_shared {
         "liblzma",
         "libmedia",
         "libmedia_helper",
-        "libmedia_player2",
         "libmedia_player2_util",
         "libmediadrm",
         "libmediaextractor",
         "libmediametrics",
+        "libmediaplayer2",
         "libmediautils",
         "libnativehelper",
         "libnetd_client",
diff --git a/media/jni/android_media_MediaPlayer2.cpp b/media/jni/android_media_MediaPlayer2.cpp
index 27eaed05b04d..0eb98f34b6bb 100644
--- a/media/jni/android_media_MediaPlayer2.cpp
+++ b/media/jni/android_media_MediaPlayer2.cpp
@@ -21,15 +21,14 @@
 
 #include <sys/stat.h>
 
-#include <media/mediaplayer2.h>
 #include <media/AudioResamplerPublic.h>
 #include <media/DataSourceDesc.h>
 #include <media/MediaHTTPService.h>
-#include <media/MediaPlayer2Interface.h>
 #include <media/MediaAnalyticsItem.h>
 #include <media/NdkWrapper.h>
 #include <media/stagefright/Utils.h>
 #include <media/stagefright/foundation/ByteUtils.h>  // for FOURCC definition
+#include <mediaplayer2/mediaplayer2.h>
 #include <stdio.h>
 #include <assert.h>
 #include <limits.h>
-- 
2.11.0