diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk index 5c95ece8..c0c39d65 100644 --- 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 diff --git a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so index 4b95eca4..29c9146f 100755 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so and b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so index a7599617..f97c1f52 100755 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so and b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a index d18b5ca1..5deb9bdc 100644 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a and b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a index 52d3e1e8..1f660826 100644 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a and b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so index 0c2dba78..ddf47a9e 100755 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so and b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so index edf10737..8ffffdfa 100755 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so and b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a b/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a index f461f3af..34a25e15 100644 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a and b/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a b/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a index 6a1fed5c..fc0ad055 100644 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a and b/proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a differ diff --git a/proprietary/drmwvmplugin/plugin-core.mk b/proprietary/drmwvmplugin/plugin-core.mk index 9c10ea6e..d7e0a058 100644 --- 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) \ diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk index 05ec5da5..99be706a 100644 --- 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) diff --git a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so index 6328bcdb..1f8b9eb5 100755 Binary files a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so and b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so differ diff --git a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so index 715af13e..57e4c64a 100755 Binary files a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so and b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so differ diff --git a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so index 047c01c8..72b706c3 100755 Binary files a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so and b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so differ diff --git a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so index 9fe9c83d..353a12d1 100755 Binary files a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so and b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so differ diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk index 68cb4ab0..63f47179 100644 --- 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) diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk index 1fbc7a6b..c3e20319 100644 --- 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) diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk index c55b3cc7..8a83e8eb 100644 --- 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) diff --git a/proprietary/wvm/wvm-core.mk b/proprietary/wvm/wvm-core.mk index a3a5ba1e..139465b5 100644 --- 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 \