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

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

Merge "refactor to remove libmedia_omx dependency from some extractor libs"

parents 6902ca10 1b39b644

media/libstagefright/Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -41,7 +41,11 @@ cc_library_static { 
        cfi: true,

    },



    shared_libs: ["libmedia", "libmediandk"],

    header_libs: [

        "libstagefright_foundation_headers",

    ],

    shared_libs: ["libmediandk"],

    export_include_dirs: ["include"],

}



cc_library_shared {
@@ -99,8 +103,6 @@ cc_library_static { 


    shared_libs: [

        "liblog",

        "libmedia",

        "libmedia_omx",

    ],



    export_include_dirs: [
@@ -108,7 +110,9 @@ cc_library_static { 
    ],



    header_libs: [

        "libmedia_helper_headers",

        "libaudioclient_headers",

        "libmedia_headers",

        "media_ndk_headers",

    ],



    cflags: [

media/libstagefright/MetaDataUtils.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <media/stagefright/foundation/ByteUtils.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MetaDataUtils.h>

#include <media/stagefright/Utils.h>

#include <media/NdkMediaFormat.h>



namespace android {