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

Commit 12806e31 authored by Chong Zhang's avatar Chong Zhang
Browse files

Revert "Revert "Separate libstagefright_omx into two libs"" 

This reverts commit a842529e.

Reason for revert: Reland with fixes to leave old libstagefright_
omx intact until partner switches to use the new lib.

Change-Id: Icf747111028f22e41f79d87c7f481d9c14c02791
parent 91ecf9f7

media/libstagefright/codecs/aacdec/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -29,12 +29,10 @@ cc_library_shared { 


    static_libs: ["libFraunhoferAAC"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "libcutils",

        "liblog",

    ],

    compile_multilib: "32",

}

media/libstagefright/codecs/aacenc/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -26,11 +26,7 @@ cc_library_shared { 


    static_libs: ["libFraunhoferAAC"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

    ],

    defaults: ["omx_soft_libs"],



    compile_multilib: "32",

}

media/libstagefright/codecs/amrnb/dec/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -101,11 +101,9 @@ cc_library_shared { 
        "libstagefright_amrwbdec",

    ],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_amrnb_common",

    ],

    compile_multilib: "32",

media/libstagefright/codecs/amrnb/enc/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -110,11 +110,9 @@ cc_library_shared { 


    static_libs: ["libstagefright_amrnbenc"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_amrnb_common",

    ],

    compile_multilib: "32",

media/libstagefright/codecs/amrwbenc/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -167,11 +167,9 @@ cc_library_shared { 


    static_libs: ["libstagefright_amrwbenc"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_enc_common",

    ],

    compile_multilib: "32",