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/apex/Android.bp b/apex/Android.bp
index 2cc6fcb..ec0efe6 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,27 +12,22 @@
// 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",
@@ -44,6 +39,12 @@
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 {