diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index b01547fa..8c348391 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -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) diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk index b0cdeb17..9c17b33c 100644 --- a/libwvdrmengine/cdm/Android.mk +++ b/libwvdrmengine/cdm/Android.mk @@ -36,7 +36,6 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libcdm 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) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index 7ec82a80..1e35ac23 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -35,29 +35,22 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libgmock \ - libgtest_ndk \ - libgtest_main_ndk \ + libgtest \ + libgtest_main \ libwvlevel3 \ libcdm_utils \ - libprotobuf-cpp-lite LOCAL_SHARED_LIBRARIES := \ libcrypto \ libcutils \ libdl \ liblog \ + libprotobuf-cpp-lite \ libssl \ - libutils + libutils \ LOCAL_CFLAGS += -DUNIT_TEST -# Needed to use gMock 1.7.0 on Android -LOCAL_CFLAGS += \ - -DGTEST_HAS_TR1_TUPLE \ - -DGTEST_USE_OWN_TR1_TUPLE \ - -LOCAL_MODULE_TARGET_ARCH := arm mips x86 - -LOCAL_CXX_STL := stlport +LOCAL_MODULE_TARGET_ARCH := arm x86 include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/include/WVErrors.h b/libwvdrmengine/include/WVErrors.h index def9a485..e23e5176 100644 --- a/libwvdrmengine/include/WVErrors.h +++ b/libwvdrmengine/include/WVErrors.h @@ -26,8 +26,8 @@ enum { kErrorTestMode = ERROR_DRM_VENDOR_MAX, }; -_STLP_STATIC_ASSERT(static_cast(kErrorWVDrmMaxErrorUsed) <= - static_cast(ERROR_DRM_VENDOR_MAX)); +static_assert(static_cast(kErrorWVDrmMaxErrorUsed) <= + static_cast(ERROR_DRM_VENDOR_MAX), ""); } // namespace wvdrm diff --git a/libwvdrmengine/level3/arm/libwvlevel3.a b/libwvdrmengine/level3/arm/libwvlevel3.a index 1aaf121f..414c340d 100644 Binary files a/libwvdrmengine/level3/arm/libwvlevel3.a and b/libwvdrmengine/level3/arm/libwvlevel3.a differ diff --git a/libwvdrmengine/level3/mips/libwvlevel3.a b/libwvdrmengine/level3/mips/libwvlevel3.a deleted file mode 100644 index df423084..00000000 Binary files a/libwvdrmengine/level3/mips/libwvlevel3.a and /dev/null differ diff --git a/libwvdrmengine/level3/x86/libwvlevel3.a b/libwvdrmengine/level3/x86/libwvlevel3.a index d7a1709f..20e8c2a7 100644 Binary files a/libwvdrmengine/level3/x86/libwvlevel3.a and b/libwvdrmengine/level3/x86/libwvlevel3.a differ diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index 11ccb613..952cec64 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -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) diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 9009f33c..8770a9ee 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -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) diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index f42d9e05..ae4dfc20 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -18,8 +18,6 @@ LOCAL_MODULE := libwvdrmdrmplugin 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) diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 8675c870..980913c4 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -21,9 +21,8 @@ LOCAL_STATIC_LIBRARIES := \ libcdm_utils \ libgmock \ libgmock_main \ - libgtest_ndk \ + libgtest \ libwvlevel3 \ - libprotobuf-cpp-lite \ libwvdrmdrmplugin \ LOCAL_SHARED_LIBRARIES := \ @@ -31,13 +30,9 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ + libprotobuf-cpp-lite \ 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 := libwvdrmdrmplugin_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) diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libwvdrmengine/oemcrypto/mock/Android.mk index 0aabbc04..bccf3328 100644 --- a/libwvdrmengine/oemcrypto/mock/Android.mk +++ b/libwvdrmengine/oemcrypto/mock/Android.mk @@ -34,8 +34,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) LOCAL_MODULE := liboemcrypto -LOCAL_MODULE_TARGET_ARCH := arm mips x86 -LOCAL_CXX_STL := stlport +LOCAL_MODULE_TARGET_ARCH := arm x86 include $(BUILD_SHARED_LIBRARY) diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index 29cfde69..96b882f2 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -6,7 +6,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE_TAGS := tests -LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_MODULE_TARGET_ARCH := arm x86 include $(LOCAL_PATH)/common.mk diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk index 3aa4ec23..ea4f8a6e 100644 --- a/libwvdrmengine/oemcrypto/test/common.mk +++ b/libwvdrmengine/oemcrypto/test/common.mk @@ -14,8 +14,8 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_utils \ - libgtest_ndk \ - libgtest_main_ndk \ + libgtest \ + libgtest_main \ libwvlevel3 \ libcdm_utils \ @@ -26,5 +26,3 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libutils \ libz \ - -LOCAL_CXX_STL := stlport diff --git a/libwvdrmengine/test/gmock/src/Android.mk b/libwvdrmengine/test/gmock/src/Android.mk index 5bb0b355..b4fa0446 100644 --- a/libwvdrmengine/test/gmock/src/Android.mk +++ b/libwvdrmengine/test/gmock/src/Android.mk @@ -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) diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 9aeee205..5e2fa5d9 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -15,14 +15,13 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ - libgtest_ndk \ - libgtest_main_ndk \ + libgtest \ + libgtest_main \ LOCAL_SHARED_LIBRARIES := \ libcrypto \ libdl \ liblog \ - libstlport \ libutils \ libwvdrmengine \ @@ -30,8 +29,6 @@ LOCAL_MODULE := libwvdrmengine_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)