Revert "Install extractors for 1st and 2nd ABIs to the test APEX"
This reverts commit 784bfac0b0e32c668aefdae2281e1f1c370c9097.
Reason for revert: decided to use device which matches to the test suite.
Bug: 131869673, Bug: 125914810
Change-Id: I5738a5303f3368f63fcd51074ee9b2db7344d518
diff --git a/apex/Android.bp b/apex/Android.bp
index ec0efe6..2cc6fcb 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,22 +12,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-com_android_media_extractors = [
- "libaacextractor",
- "libamrextractor",
- "libflacextractor",
- "libmidiextractor",
- "libmkvextractor",
- "libmp3extractor",
- "libmp4extractor",
- "libmpeg2extractor",
- "liboggextractor",
- "libwavextractor",
-]
-
apex_defaults {
name: "com.android.media-defaults",
java_libs: ["updatable-media"],
+ 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",
+ ],
+ },
+ },
key: "com.android.media.key",
certificate: ":com.android.media.certificate",
@@ -39,12 +44,6 @@
name: "com.android.media",
manifest: "manifest.json",
defaults: ["com.android.media-defaults"],
- multilib: {
- first: {
- // Extractor process runs only with the primary ABI.
- native_shared_libs: com_android_media_extractors,
- },
- },
}
filegroup {
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index 297d864..701ced7 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -17,13 +17,6 @@
manifest: "test_manifest.json",
file_contexts: "com.android.media",
defaults: ["com.android.media-defaults"],
- multilib: {
- both: {
- // for test apex, built for both ABIs
- native_shared_libs: com_android_media_extractors,
- },
- },
- compile_multilib: "both",
installable: false,
}
diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp
index 6fe5970..a58167a 100644
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@@ -20,7 +20,7 @@
name: "libaacextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/amr/Android.bp b/media/extractors/amr/Android.bp
index b26b2d8..4bd933d 100644
--- a/media/extractors/amr/Android.bp
+++ b/media/extractors/amr/Android.bp
@@ -18,7 +18,7 @@
name: "libamrextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 3e83090..3a3d051 100644
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@@ -24,7 +24,7 @@
name: "libflacextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index 6790dd6..7d42e70 100644
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@@ -19,7 +19,7 @@
name: "libmidiextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp
index 7c94149..1744d3d 100644
--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@@ -25,7 +25,7 @@
name: "libmkvextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp
index 168ef68..4e2f248 100644
--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@@ -24,7 +24,7 @@
name: "libmp3extractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index 9b9c931..1b308aa 100644
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@@ -32,7 +32,7 @@
],
version_script: "exports.lds",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
}
cc_library_shared {
diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index 14f49ae..0f0c72c 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -40,7 +40,7 @@
name: "libmpeg2extractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp
index fd03f64..604ec59 100644
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@@ -26,7 +26,7 @@
name: "liboggextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",
diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp
index 15fd796..7e89271 100644
--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@@ -21,7 +21,7 @@
name: "libwavextractor",
relative_install_path: "extractors",
- compile_multilib: "both",
+ compile_multilib: "first",
cflags: [
"-Werror",