Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
diff --git a/drm/common/Android.mk b/drm/common/Android.mk
index 249fe8e..808b2c2 100644
--- a/drm/common/Android.mk
+++ b/drm/common/Android.mk
@@ -38,4 +38,6 @@
LOCAL_MODULE:= libdrmframeworkcommon
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_STATIC_LIBRARY)
diff --git a/drm/drmioserver/Android.mk b/drm/drmioserver/Android.mk
index 32afdd3..11571c7 100644
--- a/drm/drmioserver/Android.mk
+++ b/drm/drmioserver/Android.mk
@@ -38,4 +38,6 @@
LOCAL_MODULE:= drmioserver
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_EXECUTABLE)
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk
index 46a51bc..5df2ff8 100644
--- a/drm/drmserver/Android.mk
+++ b/drm/drmserver/Android.mk
@@ -41,4 +41,6 @@
LOCAL_MODULE:= drmserver
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_EXECUTABLE)
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
index 95ce75a..b65e4da 100644
--- a/drm/jni/Android.mk
+++ b/drm/jni/Android.mk
@@ -44,5 +44,7 @@
LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk
index 765adba..99133ba 100644
--- a/drm/libdrmframework/Android.mk
+++ b/drm/libdrmframework/Android.mk
@@ -42,6 +42,8 @@
LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk
index 169b89b..7856d37 100644
--- a/drm/libdrmframework/plugins/passthru/Android.mk
+++ b/drm/libdrmframework/plugins/passthru/Android.mk
@@ -43,7 +43,6 @@
# 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)