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

Commit 40601964 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Remove MediaDrm stack from mediaserver" into nyc-dev

parents 64cc9288 3003807f

drm/libmediadrm/Android.mk

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



#

# libmediadrm

#



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	Crypto.cpp \

	Drm.cpp \

	DrmSessionManager.cpp \

	SharedLibrary.cpp



LOCAL_SHARED_LIBRARIES := \

	libbinder \

	libcrypto \

	libcutils \

	libdl \

	liblog \

	libmedia \

	libstagefright \

	libstagefright_foundation \

	libutils



LOCAL_C_INCLUDES := \

    libcore/include



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

LOCAL_CLANG := true



LOCAL_MODULE:= libmediadrm



include $(BUILD_SHARED_LIBRARY)



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

media/libmediaplayerservice/Crypto.cpp→drm/libmediadrm/Crypto.cpp

+1 −2
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
#include <dirent.h>

#include <dlfcn.h>



#include "Crypto.h"



#include <binder/IMemory.h>

#include <media/Crypto.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AString.h>

media/libmediaplayerservice/Drm.cpp→drm/libmediadrm/Drm.cpp

+3 −4
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@ 
#include <dirent.h>

#include <dlfcn.h>



#include "Drm.h"



#include "DrmSessionClientInterface.h"

#include "DrmSessionManager.h"

#include <media/DrmSessionClientInterface.h>

#include <media/DrmSessionManager.h>

#include <media/Drm.h>

#include <media/drm/DrmAPI.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AString.h>

media/libmediaplayerservice/DrmSessionManager.cpp→drm/libmediadrm/DrmSessionManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -18,12 +18,11 @@ 
#define LOG_TAG "DrmSessionManager"

#include <utils/Log.h>



#include "DrmSessionManager.h"



#include "DrmSessionClientInterface.h"

#include <binder/IPCThreadState.h>

#include <binder/IProcessInfoService.h>

#include <binder/IServiceManager.h>

#include <media/DrmSessionManager.h>

#include <media/DrmSessionClientInterface.h>

#include <media/stagefright/ProcessInfo.h>

#include <unistd.h>

#include <utils/String8.h>

media/libmediaplayerservice/SharedLibrary.cpp→drm/libmediadrm/SharedLibrary.cpp

+3 −4
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "Drm"

#include <utils/Log.h>

#include <media/stagefright/foundation/ADebug.h>



#include <dlfcn.h>



#include "SharedLibrary.h"

#include <media/stagefright/foundation/ADebug.h>

#include <media/SharedLibrary.h>

#include <utils/Log.h>



namespace android {