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

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

Merge changes from topic 'fix-omx-dependencies' into oc-dr1-dev 

* changes:
  Fix OMX dependencies.
  Use vendor variant of libstagefright_foundation.
parents f7b279fb 5550640f

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libvisualizer.so 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libaudiopreprocessing.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmediacodecservice.so)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

drm/mediadrm/plugins/clearkey/Android.bp

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

        "libcrypto",

        "liblog",

        "libstagefright_foundation_vendor",

        "libstagefright_foundation",

        "libutils",

    ],

drm/mediadrm/plugins/clearkey/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ cc_test { 
        "libcrypto",

        "libdrmclearkeyplugin",

        "liblog",

        "libstagefright_foundation_vendor",

        "libstagefright_foundation",

        "libutils",

    ],

}

media/libmedia/Android.bp

+100 −23
Original line number Diff line number Diff line
@@ -22,24 +22,117 @@ cc_library { 
    clang: true,

}



cc_library_shared {

    name: "libmedia",

// 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",



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

        "aidl/android/IOMXBufferSource.aidl",



        "IMediaCodecList.cpp",

        "IMediaCodecService.cpp",

        "IOMX.cpp",

        "MediaCodecBuffer.cpp",

        "MediaCodecInfo.cpp",

        "MediaDefs.cpp",

        "OMXBuffer.cpp",

        "omx/1.0/WGraphicBufferSource.cpp",

        "omx/1.0/WOmx.cpp",

        "omx/1.0/WOmxBufferSource.cpp",

        "omx/1.0/WOmxNode.cpp",

        "omx/1.0/WOmxObserver.cpp",

    ],



    aidl: {

        local_include_dirs: ["aidl"],

        export_aidl_headers: true,

    },



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

        "aidl/android/IOMXBufferSource.aidl",

    shared_libs: [

        "android.hidl.memory@1.0",

        "android.hidl.token@1.0-utils",

        "android.hardware.media.omx@1.0",

        "android.hardware.media@1.0",

        "libbase",

        "libbinder",

        "libcutils",

        "libgui",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libstagefright_foundation",

        "libui",

        "libutils",

    ],



    include_dirs: [

        "frameworks/av/include", // for media/vndk/xmlparser/1.0/MediaCodecsXmlParser.h

        "frameworks/av/include/media",

        "frameworks/native/include", // for media/hardware/MetadataBufferType.h

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

        "frameworks/av/media/libstagefright",

    ],



    export_shared_lib_headers: [

        "android.hidl.memory@1.0",

        "android.hidl.token@1.0-utils",

        "android.hardware.media.omx@1.0",

        "android.hardware.media@1.0",

        "libhidlmemory",

        "libstagefright_foundation",

        "libui",

    ],



    header_libs: [

        "libmedia_headers",

    ],



    export_header_lib_headers: [

        "libmedia_headers",

    ],



    export_include_dirs: [

        "aidl",

    ],



    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_omx",

    vendor_available: true,



    defaults: ["libmedia_omx_defaults"],

}



cc_library_shared {

    name: "libmedia",

    defaults: ["libmedia_omx_defaults"],



    srcs: [

        "IDataSource.cpp",

        "IHDCP.cpp",

        "BufferingSettings.cpp",

        "mediaplayer.cpp",

        "IMediaCodecList.cpp",

        "IMediaCodecService.cpp",

        "IMediaHTTPConnection.cpp",

        "IMediaHTTPService.cpp",

        "IMediaExtractor.cpp",
@@ -55,9 +148,6 @@ cc_library_shared { 
        "IResourceManagerClient.cpp",

        "IResourceManagerService.cpp",

        "IStreamSource.cpp",

        "MediaCodecBuffer.cpp",

        "MediaCodecInfo.cpp",

        "MediaDefs.cpp",

        "MediaUtils.cpp",

        "Metadata.cpp",

        "mediarecorder.cpp",
@@ -66,7 +156,6 @@ cc_library_shared { 
        "MidiDeviceInfo.cpp",

        "MidiIoWrapper.cpp",

        "JetPlayer.cpp",

        "IOMX.cpp",

        "MediaScanner.cpp",

        "MediaScannerClient.cpp",

        "CharacterEncodingDetector.cpp",
@@ -74,14 +163,8 @@ cc_library_shared { 
        "MediaProfiles.cpp",

        "MediaResource.cpp",

        "MediaResourcePolicy.cpp",

        "OMXBuffer.cpp",

        "Visualizer.cpp",

        "StringArray.cpp",

        "omx/1.0/WGraphicBufferSource.cpp",

        "omx/1.0/WOmx.cpp",

        "omx/1.0/WOmxBufferSource.cpp",

        "omx/1.0/WOmxNode.cpp",

        "omx/1.0/WOmxObserver.cpp",

    ],



    shared_libs: [
@@ -109,11 +192,8 @@ cc_library_shared { 
        "libhwbinder",

        "libhidlmemory",

        "android.hidl.memory@1.0",

        "android.hidl.token@1.0-utils",

        "android.hardware.graphics.common@1.0",

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hardware.media@1.0",

        "android.hardware.media.omx@1.0",

    ],



    export_shared_lib_headers: [
@@ -122,8 +202,6 @@ cc_library_shared { 
        "libicui18n",

        "libsonivox",

        "libmediadrm",

        "android.hidl.token@1.0-utils",

        "android.hardware.media.omx@1.0",

        "android.hidl.memory@1.0",

    ],
@@ -139,7 +217,6 @@ cc_library_shared { 
    ],



    export_include_dirs: [

        "aidl",

        "include",

    ],

    cflags: [

media/libstagefright/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ cc_library_shared { 
        "libmediautils",

        "libnetd_client",

        "libsonivox",

        "libstagefright_omx",

        "libui",

        "libutils",

        "libvorbisidec",
@@ -115,6 +114,7 @@ cc_library_shared { 
        "libstagefright_aacenc",

        "libstagefright_matroska",

        "libstagefright_mediafilter",

        "libstagefright_omx_utils",

        "libstagefright_webm",

        "libstagefright_timedtext",

        "libvpx",