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

Commit 06ec7c53 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media: omx: reorganize makefiles into a common defaults for soft OMX" into qt-dev 

am: 6e38e1a2

Change-Id: I1de411b975b25265ebb3de4a9292f53f987524a2
parents 9691946d 6e38e1a2

media/libstagefright/codecs/aacdec/Android.bp

+1 −14
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libstagefright_soft_aacdec",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    defaults: ["libstagefright_softomx-defaults"],



    srcs: [

        "SoftAAC2.cpp",

        "DrcPresModeWrap.cpp",

    ],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

        "frameworks/native/include/media/openmax",

    ],



    cflags: ["-Werror"],



    version_script: "exports.lds",



    sanitize: {
@@ -29,10 +19,7 @@ cc_library_shared { 


    static_libs: ["libFraunhoferAAC"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libcutils",

    ],

    compile_multilib: "32",

}

media/libstagefright/codecs/aacenc/Android.bp

+1 −15
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libstagefright_soft_aacenc",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    defaults: ["libstagefright_softomx-defaults"],



    srcs: ["SoftAACEncoder2.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

        "frameworks/native/include/media/openmax",

    ],



    cflags: ["-Werror"],



    version_script: "exports.lds",



    sanitize: {
@@ -25,8 +15,4 @@ cc_library_shared { 
    },



    static_libs: ["libFraunhoferAAC"],



    defaults: ["omx_soft_libs"],



    compile_multilib: "32",

}

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

+2 −14
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ cc_library_static { 
        "src/wmf_to_ets.cpp",

    ],



    include_dirs: ["frameworks/av/media/libstagefright/include"],

    export_include_dirs: ["src"],



    cflags: [
@@ -68,23 +67,14 @@ cc_library_static { 


cc_library_shared {

    name: "libstagefright_soft_amrdec",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    defaults: ["libstagefright_softomx-defaults"],



    srcs: ["SoftAMR.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

        "frameworks/av/media/libstagefright/codecs/amrwb/src",

        "frameworks/native/include/media/openmax",

    ],

    local_include_dirs: ["src"],



    cflags: [

        "-DOSCL_IMPORT_REF=",

        "-Werror",

    ],



    version_script: "exports.lds",
@@ -101,13 +91,11 @@ cc_library_shared { 
        "libstagefright_amrwbdec",

    ],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_amrnb_common",

    ],

    compile_multilib: "32",

}



//###############################################################################

cc_test {

    name: "libstagefright_amrnbdec_test",

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

+2 −14
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ cc_library_static { 
        "src/ton_stab.cpp",

    ],



    include_dirs: ["frameworks/av/media/libstagefright/include"],

    header_libs: ["libstagefright_headers"],

    export_include_dirs: ["src"],



    cflags: [
@@ -86,21 +86,12 @@ cc_library_static { 


cc_library_shared {

    name: "libstagefright_soft_amrnbenc",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    defaults: ["libstagefright_softomx-defaults"],



    srcs: ["SoftAMRNBEncoder.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

        "frameworks/native/include/media/openmax",

    ],

    local_include_dirs: ["src"],



    cflags: ["-Werror"],



    //addressing b/25409744

    //sanitize: {

    //    misc_undefined: [
@@ -110,12 +101,9 @@ cc_library_shared { 


    static_libs: ["libstagefright_amrnbenc"],



    defaults: ["omx_soft_libs"],



    shared_libs: [

        "libstagefright_amrnb_common",

    ],

    compile_multilib: "32",

}



//###############################################################################

media/libstagefright/codecs/amrwb/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ cc_library_static { 
        "src/weight_amrwb_lpc.cpp",

    ],



    include_dirs: ["frameworks/av/media/libstagefright/include"],

    header_libs: ["libstagefright_headers"],



    export_include_dirs: [

        "src",