commit f707b40645e852fc0ebaafd2685bccda64f439e5
author Dongwon Kang <dwkang@google.com> Fri Jan 25 09:08:42 2019 -0800
committer Dongwon Kang <dwkang@google.com> Mon Jan 28 09:38:35 2019 -0800
tree 271f22f4ee883f128348b6804c7cffaed94afb75
parent 79e337367c2c7bda80a89fa188966e5934b854ea

Revert "Revert "Fix MediaPlayer2Test on 32bit mode""

This reverts commit 191019ff4ec1129e6f0643b847268b5553a3383f.

Test: make systemimage on sailfish
Bug: 123361167
Change-Id: Ia65af173ebcc94a07463f4b269e648b87be21dec

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 39997d2..c077a77 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,21 +16,31 @@
     name: "com.android.media",
     manifest: "manifest.json",
     java_libs: ["updatable-media"],
-    native_shared_libs: [
-        // Extractor plugins
-        "libaacextractor",
-        "libamrextractor",
-        "libflacextractor",
-        "libmidiextractor",
-        "libmkvextractor",
-        "libmp3extractor",
-        "libmp4extractor",
-        "libmpeg2extractor",
-        "liboggextractor",
-        "libwavextractor",
-        // MediaPlayer2
-        "libmedia2_jni",
-    ],
+    compile_multilib: "both",
+    multilib: {
+        first: {
+            // Extractor process runs only with the primary ABI.
+            native_shared_libs: [
+                // Extractor plugins
+                "libaacextractor",
+                "libamrextractor",
+                "libflacextractor",
+                "libmidiextractor",
+                "libmkvextractor",
+                "libmp3extractor",
+                "libmp4extractor",
+                "libmpeg2extractor",
+                "liboggextractor",
+                "libwavextractor",
+            ],
+        },
+        both: {
+            native_shared_libs: [
+                // MediaPlayer2
+                "libmedia2_jni",
+            ],
+        },
+    },
     key: "com.android.media.key",
 }