f6ec81ffe7
This change updates gMock to the new release, 1.7.0. This is necessary for Android, as Android Master has updated their gTest to 1.7.0, and we must always use the matching version of gMock. This should not break any existing tests, as 1.7.0 is backwards-compatible with 1.6.0 code in nearly all cases. There are a few bugfixes around being too generous with type coercion in EXPECT_THAT() and ASSERT_THAT() that could break code that was accepted by the compiler before but was never technically safe. For a full list of changes, including all the awesome new matchers you can now use in your tests, see CHANGES, which is included from gMock unchanged. For a full list of modifications made to allow this to work on Android Master, see the updated README.android. No changes to the GYP files were necessary as part of this upgrade. Change-Id: Ib1445044e78c9fe0cf16031d544577d65ebbf6df
62 lines
1.4 KiB
Makefile
62 lines
1.4 KiB
Makefile
LOCAL_PATH := $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
WVDrmPlugin_test.cpp \
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
bionic \
|
|
external/gtest/include \
|
|
external/stlport/stlport \
|
|
frameworks/av/include \
|
|
frameworks/native/include \
|
|
vendor/widevine/libwvdrmengine/cdm/core/include \
|
|
vendor/widevine/libwvdrmengine/cdm/include \
|
|
vendor/widevine/libwvdrmengine/mediadrm/include \
|
|
vendor/widevine/libwvdrmengine/oemcrypto/include \
|
|
vendor/widevine/libwvdrmengine/test/gmock/include \
|
|
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libcdm \
|
|
libcdm_protos \
|
|
libcdm_utils \
|
|
libgmock \
|
|
libgmock_main \
|
|
libgtest \
|
|
libwvlevel3 \
|
|
libprotobuf-cpp-2.3.0-lite \
|
|
libwvdrmdrmplugin \
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libcrypto \
|
|
libcutils \
|
|
libdl \
|
|
liblog \
|
|
libstlport \
|
|
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
|
|
|
|
LOCAL_SRC_FILES += \
|
|
$(PROTO_SRC_DIR)/license_protocol.pb.cc \
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
$(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src \
|
|
external/protobuf/src \
|
|
|
|
LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
|
|
|
|
# End protobuf section
|
|
|
|
LOCAL_MODULE := libwvdrmdrmplugin_test
|
|
|
|
LOCAL_MODULE_TAGS := tests
|
|
|
|
include $(BUILD_EXECUTABLE)
|