Merge "Fix MediaPlayer2Test on 32bit mode" (bdd8f798) · Commits · e / os / android_frameworks_av

apex/Android.bp

+25 −15

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@ apex {
		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",
		@@ -28,9 +32,15 @@ apex {
		"libmpeg2extractor",
		"liboggextractor",
		"libwavextractor",
		],
		},
		both: {
		native_shared_libs: [
		// MediaPlayer2
		"libmedia2_jni",
		],
		},
		},
		key: "com.android.media.key",
		}