Merge "Remove Widevine Classic Dependency on STLPort"

2015-02-23 18:28:41 +00:00
parent 8e31c7f445 93e1acb958
commit 2447582816
19 changed files with 0 additions and 9 deletions
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -43,7 +43,6 @@ LOCAL_MODULE_TAGS := optional

 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)

-LOCAL_CXX_STL := stlport
 include $(BUILD_STATIC_LIBRARY)

 # invoke Android.mk files in subdirs
--- a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so
+++ b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so
--- a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so
+++ b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so
--- a/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a
+++ b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a
--- a/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a
+++ b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a
--- a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so
+++ b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so
--- a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so
+++ b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so
--- a/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a
+++ b/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a
--- a/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a
+++ b/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a
--- a/proprietary/drmwvmplugin/plugin-core.mk
+++ b/proprietary/drmwvmplugin/plugin-core.mk
@@ -19,7 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
    libutils \
    libcutils \
    liblog \
-    libstlport \
    libz \
    libwvdrm_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
    libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
--- a/proprietary/drmwvmplugin/test/Android.mk
+++ b/proprietary/drmwvmplugin/test/Android.mk
@@ -29,5 +29,4 @@ LOCAL_MODULE_TAGS := tests

 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)

-LOCAL_CXX_STL := stlport
 include $(BUILD_EXECUTABLE)
--- a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
+++ b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
--- a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so
+++ b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so
--- a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so
+++ b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so
--- a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so
+++ b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -31,6 +31,4 @@ LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 LOCAL_MULTILIB := 32

-LOCAL_CXX_STL := stlport
-
 include $(BUILD_EXECUTABLE)
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -22,5 +22,4 @@ LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 LOCAL_MULTILIB := 32
-LOCAL_CXX_STL := stlport
 include $(BUILD_STATIC_LIBRARY)
--- a/proprietary/wvm/test/Android.mk
+++ b/proprietary/wvm/test/Android.mk
@@ -25,6 +25,4 @@ LOCAL_MODULE_TAGS := tests

 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)

-LOCAL_CXX_STL := stlport
-
 include $(BUILD_EXECUTABLE)
--- a/proprietary/wvm/wvm-core.mk
+++ b/proprietary/wvm/wvm-core.mk
@@ -13,7 +13,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
    libwvmcommon

 LOCAL_SHARED_LIBRARIES := \
-    libstlport \
    libstagefright \
    libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
    libdrmframework \