blob changes

samsung/manta/device-partial.mk

@@ -22,7 +22,6 @@ PRODUCT_PACKAGES := \
     setfile_4e5 \
     setfile_6a3 \
     libGLES_mali \
-    libdrmdecrypt \
     libmalicore \
     libRSDriverArm \
     libstagefright_hdcp \

samsung/manta/proprietary/Android.mk

@@ -96,16 +96,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := samsung_arm
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdrmdecrypt
-LOCAL_SRC_FILES := libdrmdecrypt.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := samsung
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := libmalicore
 LOCAL_SRC_FILES := libmalicore.bc

samsung/manta/widevine/manta/device-partial.mk

@@ -22,6 +22,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES := \
     libwvdrm_L1 \
     libWVStreamControlAPI_L1 \
+    libwvm \
     libdrmwvmplugin \
     libdrmdecrypt \
     libwvdrmengine
+

samsung/manta/widevine/manta/proprietary/Android.mk

@@ -56,15 +56,15 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
 include $(BUILD_PREBUILT)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := libdrmdecrypt
-#LOCAL_SRC_FILES := libdrmdecrypt.so
-#LOCAL_MODULE_SUFFIX := .so
-#LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-#LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE_OWNER := widevine
-#include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libdrmdecrypt
+LOCAL_SRC_FILES := libdrmdecrypt.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := widevine
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libdrmwvmplugin