diff --git a/drm/common/Android.mk b/drm/common/Android.mk
index 249fe8e4026e2..808b2c283eff7 100644
--- a/drm/common/Android.mk
+++ b/drm/common/Android.mk
@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= libdrmframeworkcommon
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/drm/drmioserver/Android.mk b/drm/drmioserver/Android.mk
index 32afdd32f5b24..11571c7904bcd 100644
--- a/drm/drmioserver/Android.mk
+++ b/drm/drmioserver/Android.mk
@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= drmioserver
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_EXECUTABLE)
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk
index 46a51bcf926c0..5df2ff87c17eb 100644
--- a/drm/drmserver/Android.mk
+++ b/drm/drmserver/Android.mk
@@ -41,4 +41,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE:= drmserver
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_EXECUTABLE)
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
index 95ce75af20861..b65e4daafe635 100644
--- a/drm/jni/Android.mk
+++ b/drm/jni/Android.mk
@@ -44,5 +44,7 @@ LOCAL_C_INCLUDES += \
 
 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 765adba3a4744..99133ba28f2f8 100644
--- a/drm/libdrmframework/Android.mk
+++ b/drm/libdrmframework/Android.mk
@@ -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))
diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk
index 169b89babbf58..7856d3730bad6 100644
--- a/drm/libdrmframework/plugins/passthru/Android.mk
+++ b/drm/libdrmframework/plugins/passthru/Android.mk
@@ -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)