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

Remove Widevine CDM Dependency on STLPort

Browse Source 
* 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:
Dan Albert
2015-02-20 14:37:54 -08:00
committed by John "Juce" Bruce
parent bcaec72285
commit 723d67c88f
16 changed files with 27 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libwvdrmengine/test/gmock/src/Android.mk
View File

@@ -22,52 +22,26 @@ libgmock_host_includes := \
$(TOP)/external/gtest/include \
libgmock_cflags := \
-DGTEST_HAS_TR1_TUPLE \
-DGTEST_USE_OWN_TR1_TUPLE \
-Wno-missing-field-initializers \
#######################################################################
# gmock lib target
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := 9
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock
LOCAL_MODULE_TARGET_ARCH := arm mips x86
LOCAL_MODULE_TARGET_ARCH := arm x86
include $(BUILD_STATIC_LIBRARY)
#######################################################################
# gmock_main lib target
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := 9
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main
LOCAL_MODULE_TARGET_ARCH := arm mips x86
LOCAL_MODULE_TARGET_ARCH := arm x86
include $(BUILD_STATIC_LIBRARY)