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

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

Merge "Convert libmedia to Android.bp"

parents 17ed4b52 eeb43639

media/libmedia/Android.bp

+136 −0
Original line number Diff line number Diff line
@@ -18,3 +18,139 @@ cc_library { 
    },

    clang: true,

}



cc_library_shared {

    name: "libmedia",



    aidl: {

        local_include_dirs: ["aidl"],

        export_aidl_headers: true,

    },



    srcs: [

        "aidl/android/IGraphicBufferSource.aidl",

        "aidl/android/IOMXBufferSource.aidl",



        "IDataSource.cpp",

        "IHDCP.cpp",

        "BufferingSettings.cpp",

        "mediaplayer.cpp",

        "IMediaCodecList.cpp",

        "IMediaCodecService.cpp",

        "IMediaHTTPConnection.cpp",

        "IMediaHTTPService.cpp",

        "IMediaExtractor.cpp",

        "IMediaExtractorService.cpp",

        "IMediaPlayerService.cpp",

        "IMediaPlayerClient.cpp",

        "IMediaRecorderClient.cpp",

        "IMediaPlayer.cpp",

        "IMediaRecorder.cpp",

        "IMediaSource.cpp",

        "IRemoteDisplay.cpp",

        "IRemoteDisplayClient.cpp",

        "IResourceManagerClient.cpp",

        "IResourceManagerService.cpp",

        "IStreamSource.cpp",

        "MediaCodecBuffer.cpp",

        "MediaCodecInfo.cpp",

        "MediaDefs.cpp",

        "MediaUtils.cpp",

        "Metadata.cpp",

        "mediarecorder.cpp",

        "IMediaMetadataRetriever.cpp",

        "mediametadataretriever.cpp",

        "MidiDeviceInfo.cpp",

        "MidiIoWrapper.cpp",

        "JetPlayer.cpp",

        "IOMX.cpp",

        "MediaScanner.cpp",

        "MediaScannerClient.cpp",

        "CharacterEncodingDetector.cpp",

        "IMediaDeathNotifier.cpp",

        "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: [

        "libui",

        "liblog",

        "libcutils",

        "libutils",

        "libbinder",

        "libsonivox",

        "libicuuc",

        "libicui18n",

        "libexpat",

        "libcamera_client",

        "libstagefright_foundation",

        "libgui",

        "libdl",

        "libaudioutils",

        "libaudioclient",

        "libmedia_helper",

        "libmediadrm",

        "libmediametrics",

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "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: [

        "libbinder",

        "libsonivox",

        "libmediadrm",

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

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

        "android.hidl.memory@1.0",

    ],



    // for memory heap analysis

    static_libs: [

        "libc_malloc_debug_backtrace",

    ],



    include_dirs: [

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

        "frameworks/av/include/media/",

        "frameworks/av/media/libstagefright",

    ],



    export_include_dirs: [

        "aidl",

        "include",

    ],

    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

    },

}

media/libmedia/Android.mk

deleted100644 → 0
+0 −115
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_AIDL_INCLUDES := \

    frameworks/av/media/libmedia/aidl



LOCAL_SRC_FILES:= \

    aidl/android/IGraphicBufferSource.aidl \

    aidl/android/IOMXBufferSource.aidl



LOCAL_SRC_FILES += \

    IDataSource.cpp \

    IHDCP.cpp \

    BufferingSettings.cpp \

    mediaplayer.cpp \

    IMediaCodecList.cpp \

    IMediaCodecService.cpp \

    IMediaHTTPConnection.cpp \

    IMediaHTTPService.cpp \

    IMediaExtractor.cpp           \

    IMediaExtractorService.cpp \

    IMediaPlayerService.cpp \

    IMediaPlayerClient.cpp \

    IMediaRecorderClient.cpp \

    IMediaPlayer.cpp \

    IMediaRecorder.cpp \

    IMediaSource.cpp \

    IRemoteDisplay.cpp \

    IRemoteDisplayClient.cpp \

    IResourceManagerClient.cpp \

    IResourceManagerService.cpp \

    IStreamSource.cpp \

    MediaCodecBuffer.cpp \

    MediaCodecInfo.cpp \

    MediaDefs.cpp \

    MediaUtils.cpp \

    Metadata.cpp \

    mediarecorder.cpp \

    IMediaMetadataRetriever.cpp \

    mediametadataretriever.cpp \

    MidiDeviceInfo.cpp \

    MidiIoWrapper.cpp \

    JetPlayer.cpp \

    IOMX.cpp \

    MediaScanner.cpp \

    MediaScannerClient.cpp \

    CharacterEncodingDetector.cpp \

    IMediaDeathNotifier.cpp \

    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 \



LOCAL_SHARED_LIBRARIES := \

        libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils libaudioclient \

        libmedia_helper libmediadrm \

        libmediametrics \

        libbase \

        libhidlbase \

        libhidltransport \

        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 \



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \

        libbinder \

        libsonivox \

        libmediadrm \

        android.hidl.token@1.0-utils \

        android.hardware.media.omx@1.0 \

        android.hidl.memory@1.0 \



LOCAL_HEADER_LIBRARIES := libmedia_headers



# for memory heap analysis

LOCAL_STATIC_LIBRARIES := libc_malloc_debug_backtrace



LOCAL_MODULE:= libmedia



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_C_INCLUDES := \

    $(TOP)/system/libhidl/base/include \

    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/av/include/media/ \

    $(TOP)/frameworks/av/media/libmedia/aidl \

    $(TOP)/frameworks/av/include \

    $(TOP)/frameworks/native/include \

    $(call include-path-for, audio-utils)



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    frameworks/av/include/media \

    frameworks/av/media/libmedia/aidl \



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/omx/BWGraphicBufferSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <OMX_IndexExt.h>



#include <media/OMXBuffer.h>

#include <IOMX.h>

#include <media/IOMX.h>



#include "OMXUtils.h"

#include "BWGraphicBufferSource.h"

media/libstagefright/omx/BWGraphicBufferSource.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <binder/Status.h>

#include <android/BnGraphicBufferSource.h>

#include <android/BnOMXBufferSource.h>

#include <IOMX.h>

#include <media/IOMX.h>



#include "GraphicBufferSource.h"

#include "IOmxNodeWrapper.h"

media/libstagefright/omx/GraphicBufferSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "omx/OMXUtils.h"

#include <OMX_Component.h>

#include <OMX_IndexExt.h>

#include "OMXBuffer.h"

#include "media/OMXBuffer.h"



#include <inttypes.h>

#include "FrameDropper.h"