commit 672e68f03fc994f34f787813d7e6d936ae2f261b
author Dongwon Kang <dwkang@google.com> Tue Apr 16 11:44:56 2019 -0700
committer Dongwon Kang <dwkang@google.com> Tue Apr 16 11:46:27 2019 -0700
tree 2e858d20971203cfc5907652845c47b095e76e1e
parent acfd148dd2df332402d6c05a02c146b4f9c47680

Remove MediaPlayer2 from media apex.

Test: build, atest MediaSession2Test
Bug: 130637522
Change-Id: Id096b344fcaddbc79b333ee53bb8da59100bcd13

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 0a9551d..2cc6fcb 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -15,7 +15,6 @@
 apex_defaults {
     name: "com.android.media-defaults",
     java_libs: ["updatable-media"],
-    compile_multilib: "both",
     multilib: {
         first: {
             // Extractor process runs only with the primary ABI.
@@ -33,12 +32,6 @@
                 "libwavextractor",
             ],
         },
-        both: {
-            native_shared_libs: [
-                // MediaPlayer2
-                "libmedia2_jni",
-            ],
-        },
     },
     key: "com.android.media.key",
     certificate: ":com.android.media.certificate",