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

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

Merge "Convert libmediadrm to Android.bp" into oc-dev-plus-aosp

parents 031d7c28 94b8c5df

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ ndk_headers { 


subdirs = [

    "camera",

    "drm/*",

    "media/*",

    "radio",

    "soundtrigger",

drm/libmediadrm/Android.bp

0 → 100644
+52 −0
Original line number Diff line number Diff line 
//

// libmediadrm

//



cc_library_shared {

    name: "libmediadrm",



    aidl: {

        local_include_dirs: ["aidl"],

        export_aidl_headers: true,

    },



    srcs: [

        "aidl/android/media/ICas.aidl",

        "aidl/android/media/ICasListener.aidl",

        "aidl/android/media/IDescrambler.aidl",

        "aidl/android/media/IMediaCasService.aidl",



        "CasImpl.cpp",

        "DescramblerImpl.cpp",

        "DrmPluginPath.cpp",

        "DrmSessionManager.cpp",

        "ICrypto.cpp",

        "IDrm.cpp",

        "IDrmClient.cpp",

        "IMediaDrmService.cpp",

        "MediaCasDefs.cpp",

        "SharedLibrary.cpp",

        "DrmHal.cpp",

        "CryptoHal.cpp",

    ],



    shared_libs: [

        "libbinder",

        "libcutils",

        "libdl",

        "liblog",

        "libmediautils",

        "libstagefright_foundation",

        "libutils",

        "android.hidl.base@1.0",

        "android.hardware.drm@1.0",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],

}

drm/libmediadrm/Android.mk

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



#

# libmediadrm

#



include $(CLEAR_VARS)



LOCAL_AIDL_INCLUDES := \

    frameworks/av/drm/libmediadrm/aidl



LOCAL_SRC_FILES := \

    aidl/android/media/ICas.aidl \

    aidl/android/media/ICasListener.aidl \

    aidl/android/media/IDescrambler.aidl \

    aidl/android/media/IMediaCasService.aidl \



LOCAL_SRC_FILES += \

    CasImpl.cpp \

    DescramblerImpl.cpp \

    DrmPluginPath.cpp \

    DrmSessionManager.cpp \

    ICrypto.cpp \

    IDrm.cpp \

    IDrmClient.cpp \

    IMediaDrmService.cpp \

    MediaCasDefs.cpp \

    SharedLibrary.cpp \

    DrmHal.cpp \

    CryptoHal.cpp



LOCAL_SHARED_LIBRARIES := \

    libbinder \

    libcutils \

    libdl \

    liblog \

    libmediautils \

    libstagefright_foundation \

    libutils \

    android.hidl.base@1.0 \

    android.hardware.drm@1.0 \

    libhidlbase \

    libhidlmemory \

    libhidltransport



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



LOCAL_MODULE:= libmediadrm



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))