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

Commit bd20f6bc authored by Marco Nelissen's avatar Marco Nelissen Committed by Colin Cross
Browse files

Clean up mediadrm dependencies 

Move various things around so mediadrmserver doesn't need
libstagefright and libmedia

Test: build/boot
Change-Id: I48b713cd679b992cb6ad1262c20394a9892d7027
Merged-In: I48b713cd679b992cb6ad1262c20394a9892d7027
(cherry picked from commit 75571e4b)
parent f99ffd98

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