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

Commit 12213cec authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes I0dc38288,I48b713cd am: 6fb63cba 

am: d91dd4f0

Change-Id: I30bf24ba680be327928ed6e13d473fc8f1f71d3c
parents 0f3e20f5 d91dd4f0

drm/libmediadrm/Android.mk

+15 −11
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ LOCAL_SRC_FILES:= \ 
    Crypto.cpp \

    Drm.cpp \

    DrmSessionManager.cpp \

    ICrypto.cpp \

    IDrm.cpp \

    IDrmClient.cpp \

    IMediaDrmService.cpp \

    SharedLibrary.cpp



LOCAL_SHARED_LIBRARIES := \
@@ -17,8 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libdl \

    liblog \

	libmedia \

	libstagefright \

    libmediautils \

    libstagefright_foundation \

    libutils



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

media/libmedia/IDrm.cpp→drm/libmediadrm/IDrm.cpp

+0 −0

File moved.

View file