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

Commit dd978d74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Separate libstagefright_omx into two libs"""

parents 43b869d6 12806e31

media/libstagefright/codecs/aacdec/Android.bp

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




    static_libs: ["libFraunhoferAAC"],

    static_libs: ["libFraunhoferAAC"],





    defaults: ["omx_soft_libs"],



    shared_libs: [

    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "libcutils",

        "libcutils",

        "liblog",

    ],

    ],

    compile_multilib: "32",

    compile_multilib: "32",

}
 
}

media/libstagefright/codecs/aacenc/Android.bp

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




    static_libs: ["libFraunhoferAAC"],

    static_libs: ["libFraunhoferAAC"],





    shared_libs: [

    defaults: ["omx_soft_libs"],

        "libstagefright_omx",



        "libstagefright_foundation",

        "libutils",

        "liblog",

    ],

    compile_multilib: "32",

    compile_multilib: "32",

}
 
}

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

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

        "libstagefright_amrwbdec",

    ],

    ],





    defaults: ["omx_soft_libs"],



    shared_libs: [

    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_amrnb_common",

        "libstagefright_amrnb_common",

    ],

    ],

    compile_multilib: "32",

    compile_multilib: "32",

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

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




    static_libs: ["libstagefright_amrnbenc"],

    static_libs: ["libstagefright_amrnbenc"],





    defaults: ["omx_soft_libs"],



    shared_libs: [

    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_amrnb_common",

        "libstagefright_amrnb_common",

    ],

    ],

    compile_multilib: "32",

    compile_multilib: "32",

media/libstagefright/codecs/amrwbenc/Android.bp

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




    static_libs: ["libstagefright_amrwbenc"],

    static_libs: ["libstagefright_amrwbenc"],





    defaults: ["omx_soft_libs"],



    shared_libs: [

    shared_libs: [

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",

        "liblog",

        "libstagefright_enc_common",

        "libstagefright_enc_common",

    ],

    ],

    compile_multilib: "32",

    compile_multilib: "32",