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

Commit efe396f4 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Include external modules statically in extractor implementations 

- Statically include libvorbisidec in OggExtractor
- Statically include libstagefright_flacdec in MatroskaExtractor
- Statically include libsonivox in MidiExtractor
- Include MidiIoWrapper as a static lib in MidiExtractor

Test: build
Bug: 65851881
Bug: 67908539
Change-Id: I1406f86e7a64fe96a1fdbcaeaa47912dfe34f33a
parent 08a5a3a4

media/extractors/midi/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -8,13 +8,15 @@ cc_library_shared { 


    shared_libs: [

        "liblog",

        "libmedia",  // Needed for MidiIoWrapper

        "libmediaextractor",

        "libsonivox",

        "libstagefright_foundation",

        "libutils",

    ],



    static_libs: [

        "libmedia_midiiowrapper",

        "libsonivox",

    ],

    name: "libmidiextractor",

    relative_install_path: "extractors",

media/extractors/mkv/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ cc_library_shared { 
    shared_libs: [

        "liblog",

        "libmediaextractor",

        "libstagefright_flacdec",

        "libstagefright_foundation",

        "libutils",

    ],



    static_libs: [

        "libstagefright_flacdec",

        "libwebm",

    ],

media/extractors/ogg/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ cc_library_shared { 
        "libmediaextractor",

        "libstagefright_foundation",

        "libutils",

    ],



    static_libs: [

        "libvorbisidec",

    ],

media/libmedia/Android.bp

+29 −3
Original line number Diff line number Diff line
@@ -122,6 +122,33 @@ cc_library_shared { 
    defaults: ["libmedia_omx_defaults"],

}



cc_library_static {

    name: "libmedia_midiiowrapper",



    srcs: ["MidiIoWrapper.cpp"],



    static_libs: [

        "libsonivox",

    ],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

    },

}



cc_library_shared {

    name: "libmedia",

    defaults: ["libmedia_omx_defaults"],
@@ -151,7 +178,6 @@ cc_library_shared { 
        "IMediaMetadataRetriever.cpp",

        "mediametadataretriever.cpp",

        "MidiDeviceInfo.cpp",

        "MidiIoWrapper.cpp",

        "JetPlayer.cpp",

        "MediaScanner.cpp",

        "MediaScannerClient.cpp",
@@ -193,9 +219,9 @@ cc_library_shared { 
        "libsonivox",

    ],



    // for memory heap analysis

    static_libs: [

        "libc_malloc_debug_backtrace",

        "libc_malloc_debug_backtrace",  // for memory heap analysis

        "libmedia_midiiowrapper",

    ],



    export_include_dirs: [

media/libstagefright/flac/dec/Android.bp

+8 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libstagefright_flacdec",

    vendor_available: true,

    vndk: {
@@ -27,7 +27,13 @@ cc_library_shared { 
        },

    },



    static: {

        whole_static_libs: ["libFLAC"],

    },



    shared: {

        static_libs: ["libFLAC"],

    },



    shared_libs: [

        "liblog",