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

Commit 6add681c authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert libmedia to Android.bp" am: 23f4ff1d

am: 7e47c13f

Change-Id: Iabed988ba2a1e617f3ec33f5651363123c312c9d
parents 88874349 7e47c13f
Loading
Loading
Loading
Loading
+94 −0
Original line number Original line Diff line number Diff line
@@ -8,3 +8,97 @@ cc_library_static {
    ],
    ],
    clang: true,
    clang: true,
}
}

cc_library_shared {
    name: "libmedia",

    srcs: [
        "IDataSource.cpp",
        "IHDCP.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",
        "MediaCodecInfo.cpp",
        "MediaDefs.cpp",
        "MediaUtils.cpp",
        "Metadata.cpp",
        "mediarecorder.cpp",
        "IMediaMetadataRetriever.cpp",
        "mediametadataretriever.cpp",
        "MidiIoWrapper.cpp",
        "JetPlayer.cpp",
        "IOMX.cpp",
        "MediaScanner.cpp",
        "MediaScannerClient.cpp",
        "CharacterEncodingDetector.cpp",
        "IMediaDeathNotifier.cpp",
        "MediaProfiles.cpp",
        "MediaResource.cpp",
        "MediaResourcePolicy.cpp",
        "Visualizer.cpp",
        "StringArray.cpp",
    ],

    shared_libs: [
        "libui",
        "liblog",
        "libcutils",
        "libutils",
        "libbinder",
        "libsonivox",
        "libicuuc",
        "libicui18n",
        "libexpat",
        "libcamera_client",
        "libstagefright_foundation",
        "libgui",
        "libdl",
        "libaudioutils",
        "libaudioclient",
    ],

    header_libs: ["libaudioeffects"],

    export_shared_lib_headers: ["libbinder"],

    whole_static_libs: ["libmedia_helper"],

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

    cflags: [
        "-Werror",
        "-Wno-error=deprecated-declarations",
        "-Wall",
    ],

    sanitize: {
        misc_undefined: [
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
    },
}

media/libmedia/Android.mk

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

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    IDataSource.cpp \
    IHDCP.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 \
    MediaCodecInfo.cpp \
    MediaDefs.cpp \
    MediaUtils.cpp \
    Metadata.cpp \
    mediarecorder.cpp \
    IMediaMetadataRetriever.cpp \
    mediametadataretriever.cpp \
    MidiIoWrapper.cpp \
    JetPlayer.cpp \
    IOMX.cpp \
    MediaScanner.cpp \
    MediaScannerClient.cpp \
    CharacterEncodingDetector.cpp \
    IMediaDeathNotifier.cpp \
    MediaProfiles.cpp \
    MediaResource.cpp \
    MediaResourcePolicy.cpp \
    Visualizer.cpp \
    StringArray.cpp \

LOCAL_SHARED_LIBRARIES := \
	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \
        libcamera_client libstagefright_foundation \
        libgui libdl libaudioutils libaudioclient

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder

LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper

# 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)/frameworks/native/include/media/openmax \
    $(TOP)/frameworks/av/include/media/ \
    $(TOP)/frameworks/av/media/libstagefright \
    $(call include-path-for, audio-effects) \
    $(call include-path-for, audio-utils)

LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

include $(BUILD_SHARED_LIBRARY)