Remove Widevine CDM Dependency on STLPort
* Replace an stlport static assert with a C++11 static_assert. * Move some libraries that were being built with the NDK but statically included into platform code off the NDK. * Rebuild the obfuscated binaries to use the new STL. * Remove MIPS support temporarily due to an inability to generate obfuscated binaries for it. (To be fixed in b/19482469.) Bug: 15193147 Change-Id: Icc166583b0c6af68550baf17ab8c33076a1179d3
This commit is contained in:
committed by
John "Juce" Bruce
parent
bcaec72285
commit
723d67c88f
@@ -18,8 +18,6 @@ LOCAL_MODULE := libwvdrmcryptoplugin
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_MODULE_TARGET_ARCH := arm mips x86
|
||||
|
||||
LOCAL_CXX_STL := stlport
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
@@ -20,9 +20,8 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
libcdm_utils \
|
||||
libgmock \
|
||||
libgmock_main \
|
||||
libgtest_ndk \
|
||||
libgtest \
|
||||
libwvlevel3 \
|
||||
libprotobuf-cpp-lite \
|
||||
libwvdrmcryptoplugin \
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
@@ -30,14 +29,10 @@ LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
libdl \
|
||||
liblog \
|
||||
libprotobuf-cpp-lite \
|
||||
libstagefright_foundation \
|
||||
libutils \
|
||||
|
||||
# Needed to use gMock 1.7.0 on Android
|
||||
LOCAL_CFLAGS += \
|
||||
-DGTEST_HAS_TR1_TUPLE \
|
||||
-DGTEST_USE_OWN_TR1_TUPLE \
|
||||
|
||||
# CDM's protobuffers are not part of the library
|
||||
PROTO_SRC_DIR := $(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src
|
||||
|
||||
@@ -56,8 +51,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_test
|
||||
|
||||
LOCAL_MODULE_TAGS := tests
|
||||
|
||||
LOCAL_MODULE_TARGET_ARCH := arm mips x86
|
||||
|
||||
LOCAL_CXX_STL := stlport
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
Reference in New Issue
Block a user