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

Commit 42f2b093 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge "refactor to remove libmedia_omx dependency from some extractor libs" am: 2d130048 

Change-Id: I6d1f33fa4037316af073e698160c1de54c67bf7b
parents 8a53a5c1 2d130048

media/libstagefright/Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -63,7 +63,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 {
@@ -121,8 +125,6 @@ cc_library_static { 


    shared_libs: [

        "liblog",

        "libmedia",

        "libmedia_omx",

    ],



    export_include_dirs: [
@@ -130,7 +132,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 {