commit 6ac67f7293648405c623889b62ad3d2e384f5110
author Dongwon Kang <dwkang@google.com> Thu Jan 10 18:58:13 2019 -0800
committer Dongwon Kang <dwkang@google.com> Mon Jan 14 13:33:28 2019 -0800
tree eb4fb557e90fdb75d6f211a56ee77dac39d190f0
parent 8c30fbae6d3b1e48e6f97dd605ba801aa314fbe0

Load MediaPlayer2 implementation with a linker namespace.

MediaPlayer2 calls System.loadLibrary(media2_jni) and
libmedia2_jni loads the MediaPlayer2 native implementation
in libmediaplayer2_jni with an isolated linker namespace.

Test: build & boot & atest MediaPlayer2Test
Bug: 112766913
Change-Id: I07c542da5ccb305f839cda488c9e83b43c98c9e1

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index d6b6339..ec20ca8 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -85,7 +85,7 @@
 }
 
 cc_library_shared {
-    name: "libmedia2_jni",
+    name: "libmediaplayer2_jni",
 
     srcs: [
         "android_media_DataSourceCallback.cpp",
@@ -117,7 +117,10 @@
         "libz",
     ],
 
-    header_libs: ["libhardware_headers"],
+    header_libs: [
+        "libhardware_headers",
+        "libnativewindow_headers",
+    ],
 
     static_libs: [
         "libbase",