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

Commit afca9ca2 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Convert libmediadrm to Android.bp"

parents 1d89f8da 47552dd9

Android.bp

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




subdirs = [

subdirs = [

    "camera",

    "camera",

    "drm/*",

    "media/*",

    "media/*",

    "radio",

    "radio",

    "soundtrigger",

    "soundtrigger",

drm/libmediadrm/Android.bp

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

// libmediadrm

//



cc_library_shared {

    name: "libmediadrm",



    srcs: [

        "Crypto.cpp",

        "Drm.cpp",

        "DrmSessionManager.cpp",

        "ICrypto.cpp",

        "IDrm.cpp",

        "IDrmClient.cpp",

        "IMediaDrmService.cpp",

        "SharedLibrary.cpp",

    ],



    shared_libs: [

        "libbinder",

        "libcutils",

        "libdl",

        "liblog",

        "libmediautils",

        "libstagefright_foundation",

        "libutils",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],

}

drm/libmediadrm/Android.mk

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



#

# libmediadrm

#



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    Crypto.cpp \

    Drm.cpp \

    DrmSessionManager.cpp \

    ICrypto.cpp \

    IDrm.cpp \

    IDrmClient.cpp \

    IMediaDrmService.cpp \

    SharedLibrary.cpp



LOCAL_SHARED_LIBRARIES := \

    libbinder \

    libcutils \

    libdl \

    liblog \

    libmediautils \

    libstagefright_foundation \

    libutils



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



LOCAL_MODULE:= libmediadrm



include $(BUILD_SHARED_LIBRARY)



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