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

Commit 598a5324 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "Revert "Install extractors for 1st and 2nd ABIs to the test APEX"" into qt-dev 

am: eb1b8e4a

Change-Id: Ib68fa1455c3c53b9a3e40c7d1fb79f918863bb3e
parents 0bfaf7ec eb1b8e4a

apex/Android.bp

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

// limitations under the License.



com_android_media_extractors = [

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",
@@ -23,11 +30,9 @@ com_android_media_extractors = [ 
                "libmpeg2extractor",

                "liboggextractor",

                "libwavextractor",

]



apex_defaults {

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

    java_libs: ["updatable-media"],

            ],

        },

    },

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

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

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

    compile_multilib: "first",



    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: "both",

    compile_multilib: "first",



    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: "both",

    compile_multilib: "first",



    cflags: [

        "-Werror",