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
@@ -29,7 +29,6 @@ LOCAL_SRC_FILES := third_party/stringencoders/src/modp_b64w.cpp \
|
||||
$(SRC_DIR)/properties_android.cpp \
|
||||
$(SRC_DIR)/timer.cpp \
|
||||
|
||||
LOCAL_CXX_STL := stlport
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
@@ -55,7 +54,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||
$(generated_sources_dir)/proto \
|
||||
$(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src
|
||||
|
||||
LOCAL_CXX_STL := stlport
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# proto_generated_headers is a build system internal variable defined in
|
||||
@@ -89,7 +87,6 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
libcdm \
|
||||
libcdm_utils \
|
||||
libwvlevel3 \
|
||||
libprotobuf-cpp-lite \
|
||||
libwvdrmcryptoplugin \
|
||||
libwvdrmdrmplugin \
|
||||
|
||||
@@ -98,13 +95,12 @@ LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
libdl \
|
||||
liblog \
|
||||
libprotobuf-cpp-lite \
|
||||
libutils \
|
||||
libstagefright_foundation \
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
|
||||
|
||||
LOCAL_CXX_STL := stlport
|
||||
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
|
||||
|
||||
LOCAL_MODULE := libwvdrmengine
|
||||
@@ -117,7 +113,7 @@ LOCAL_MODULE_OWNER := widevine
|
||||
|
||||
LOCAL_PROPRIETARY_MODULE := true
|
||||
|
||||
LOCAL_MODULE_TARGET_ARCH := arm mips x86
|
||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user