Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 784bfac0 authored by Jiyong Park's avatar Jiyong Park
Browse files

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
parent e069424f

apex/Android.bp

+19 −18
Original line number Diff line number Diff line
@@ -12,14 +12,7 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



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

com_android_media_extractors = [

    "libaacextractor",

    "libamrextractor",

    "libflacextractor",
@@ -30,9 +23,11 @@ apex_defaults { 
    "libmpeg2extractor",

    "liboggextractor",

    "libwavextractor",

            ],

        },

    },

]



apex_defaults {

    name: "com.android.media-defaults",

    java_libs: ["updatable-media"],

    key: "com.android.media.key",

    certificate: ":com.android.media.certificate",
@@ -44,6 +39,12 @@ apex { 
    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 {

apex/testing/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ apex { 
    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,

}

media/extractors/aac/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_library_shared { 
    name: "libaacextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",

    compile_multilib: "both",



    cflags: [

        "-Werror",

media/extractors/amr/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ cc_library_shared { 
    name: "libamrextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",

    compile_multilib: "both",



    cflags: [

        "-Werror",

media/extractors/flac/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ cc_library_shared { 
    name: "libflacextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",

    compile_multilib: "both",



    cflags: [

        "-Werror",