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

Commit aad376ae authored by John Tsai's avatar John Tsai Committed by Android (Google) Code Review
Browse files

Merge "Revert "Separate libstagefright_omx into two libs""

parents 970841ad a842529e

media/libstagefright/codecs/aacdec/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ 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

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


    static_libs: ["libFraunhoferAAC"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

    ],

    compile_multilib: "32",

}

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

+4 −2
Original line number Diff line number Diff line
@@ -101,9 +101,11 @@ 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

+4 −2
Original line number Diff line number Diff line
@@ -110,9 +110,11 @@ 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

+4 −2
Original line number Diff line number Diff line
@@ -167,9 +167,11 @@ 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",