widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Widevine Classic Dependency on STLPort"

Browse Source
This commit is contained in:
John Bruce
2015-02-23 18:28:41 +00:00
committed by Android (Google) Code Review
parent 8e31c7f445 93e1acb958
commit 2447582816
19 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proprietary/drmwvmplugin/Android.mk
View File

@@ -43,7 +43,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_CXX_STL := stlport
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# invoke Android.mk files in subdirs # invoke Android.mk files in subdirs

BIN
proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/x86/libwvdrm_L3.so
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a
View File

Binary file not shown.

BIN
proprietary/drmwvmplugin/lib/x86/libwvocs_L3.a
View File

Binary file not shown.

1
proprietary/drmwvmplugin/plugin-core.mk
View File

@@ -19,7 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
libcutils \ libcutils \
liblog \ liblog \
libstlport \
libz \ libz \
libwvdrm_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \ libwvdrm_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \ libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \

1
proprietary/drmwvmplugin/test/Android.mk
View File

@@ -29,5 +29,4 @@ LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_CXX_STL := stlport
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

BIN
proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
View File

Binary file not shown.

BIN
proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so
View File

Binary file not shown.

BIN
proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so
View File

Binary file not shown.

BIN
proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L3.so
View File

Binary file not shown.

2
proprietary/streamcontrol/test/Android.mk
View File

@@ -31,6 +31,4 @@ LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_CXX_STL := stlport
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
proprietary/wvm/Android.mk
View File

@@ -22,5 +22,4 @@ LOCAL_MODULE := libwvmcommon
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_CXX_STL := stlport
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
proprietary/wvm/test/Android.mk
View File

@@ -25,6 +25,4 @@ LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_CXX_STL := stlport
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
proprietary/wvm/wvm-core.mk
View File

@@ -13,7 +13,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwvmcommon libwvmcommon
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libstlport \
libstagefright \ libstagefright \
libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \ libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
libdrmframework \ libdrmframework \