Revert "Fix MediaPlayer2Test on 32bit mode"
This reverts commit 8fc45862aa5fab7c7161a086a9f0c445fa91cf4d.
Reason for revert: Build failure on sailfish due to system partition space.
Change-Id: Ief6199e3b1a1fc842a34a225c4f6e567a99bcfe7
diff --git a/apex/Android.bp b/apex/Android.bp
index c077a77..39997d2 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,31 +16,21 @@
name: "com.android.media",
manifest: "manifest.json",
java_libs: ["updatable-media"],
- 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",
- ],
- },
- },
+ native_shared_libs: [
+ // Extractor plugins
+ "libaacextractor",
+ "libamrextractor",
+ "libflacextractor",
+ "libmidiextractor",
+ "libmkvextractor",
+ "libmp3extractor",
+ "libmp4extractor",
+ "libmpeg2extractor",
+ "liboggextractor",
+ "libwavextractor",
+ // MediaPlayer2
+ "libmedia2_jni",
+ ],
key: "com.android.media.key",
}