Install extractors for 1st and 2nd ABIs to the test APEX
The test APEX is built with aosp_x86_64 where first ABI is 64-bit.
But the test APEX can be installed to 32-bit target like cf_x86_phone.
The lack of 32-bit extractor libraries in the 32-bit target can cause
problem. So, install both ABIs of the extractor libraries to the test
APEX.
Bug: 125914810
Test: choosecombo to aosp_x86_64 and build test_com.android.media
Check that the test APEX has both lib and lib64 directories.
Change-Id: Ib073f61838fea0b823c870c8c71b49a7ecc9346e
diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp
index a58167a..6fe5970 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/amr/Android.bp b/media/extractors/amr/Android.bp
index 4bd933d..b26b2d8 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 3a3d051..3e83090 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index 7d42e70..6790dd6 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp
index 1744d3d..7c94149 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp
index 4e2f248..168ef68 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index 1b308aa..9b9c931 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: "first",
+ compile_multilib: "both",
}
cc_library_shared {
diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index 0f0c72c..14f49ae 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp
index 604ec59..fd03f64 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",
diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp
index 7e89271..15fd796 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: "first",
+ compile_multilib: "both",
cflags: [
"-Werror",