Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec06144c: am 36edb202: Merge "Make DRM libraries optional"

Browse Source 
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
This commit is contained in:
Jean-Baptiste Queru
2010-09-12 08:59:29 -07:00
committed by Android Git Automerger
parent 0ce6c0f82d ec06144c9d
commit 5af8c63e48
6 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drm/common/Android.mk
View File

@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= libdrmframeworkcommon
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)

2
drm/drmioserver/Android.mk
View File

@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= drmioserver
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)

2
drm/drmserver/Android.mk
View File

@@ -41,4 +41,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= drmserver
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)

2
drm/jni/Android.mk
View File

@@ -44,5 +44,7 @@ LOCAL_C_INCLUDES += \
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)

2
drm/libdrmframework/Android.mk
View File

@@ -42,6 +42,8 @@ LOCAL_C_INCLUDES += \
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

3
drm/libdrmframework/plugins/passthru/Android.mk
View File

@@ -43,7 +43,6 @@ LOCAL_C_INCLUDES += \
# Set the following flag to enable the decryption passthru flow
#LOCAL_CFLAGS += -DENABLE_PASSTHRU_DECRYPTION
PRODUCT_COPY_FILES += \
$(TARGET_OUT_SHARED_LIBRARIES)/libdrmpassthruplugin.so:system/lib/drm/plugins/native/libdrmpassthruplugin.so
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)