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

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

Merge "Remove libmedia_omx_defaults from libmedia"

parents 5e2ba1b7 8568cb93

cmds/screenrecord/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_SRC_FILES := \ 
	Program.cpp



LOCAL_SHARED_LIBRARIES := \

	libstagefright libmedia libutils libbinder libstagefright_foundation \

	libstagefright libmedia libmedia_omx libutils libbinder libstagefright_foundation \

	libjpeg libui libgui libcutils liblog libEGL libGLESv2



LOCAL_C_INCLUDES := \

cmds/stagefright/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ 
        SineSource.cpp



LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmediaextractor libutils libbinder \

        libstagefright libmedia libmedia_omx libmediaextractor libutils libbinder \

        libstagefright_foundation libjpeg libui libgui libcutils liblog \

        libhidlmemory \

        android.hardware.media.omx@1.0 \
@@ -135,7 +135,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libstagefright_foundation \

        libmedia libaudioclient libui libgui libcutils

        libmedia libmedia_omx libaudioclient libui libgui libcutils



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \
@@ -166,6 +166,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libbinder \

        libstagefright_foundation \

        libmedia \

        libmedia_omx \

        libui \

        libgui \

        libcutils \

media/libmedia/Android.bp

+8 −15
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ cc_library { 
    clang: true,

}



// TODO(b/35449087): merge back with libmedia when OMX implementatoins

// no longer use aidl wrappers (or remove OMX component form libmedia)

cc_defaults {

    name: "libmedia_omx_defaults",

cc_library_shared {

    name: "libmedia_omx",

    vendor_available: true,

    vndk: {

        enabled: true,

    },



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",
@@ -112,16 +114,6 @@ cc_defaults { 
    },

}



cc_library_shared {

    name: "libmedia_omx",

    vendor_available: true,

    vndk: {

        enabled: true,

    },



    defaults: ["libmedia_omx_defaults"],

}



cc_library_static {

    name: "libmedia_midiiowrapper",
@@ -151,7 +143,6 @@ cc_library_static { 


cc_library_shared {

    name: "libmedia",

    defaults: ["libmedia_omx_defaults"],



    srcs: [

        "IDataSource.cpp",
@@ -209,6 +200,7 @@ cc_library_shared { 
        "libaudioclient",

        "libhidlbase",

        "libhidltransport",

        "libmedia_omx",

    ],



    export_shared_lib_headers: [
@@ -217,6 +209,7 @@ cc_library_shared { 
        "libicuuc",

        "libicui18n",

        "libsonivox",

        "libmedia_omx",

    ],



    static_libs: [

media/libmediaplayerservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ cc_library_shared { 
        "libhidlmemory",

        "liblog",

        "libmedia",

        "libmedia_omx",

        "libmediaextractor",

        "libmediadrm",

        "libmediametrics",

media/libstagefright/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ cc_library_shared { 
        "libgui",

        "liblog",

        "libmedia",

        "libmedia_omx",

        "libaudioclient",

        "libmediaextractor",

        "libmediametrics",