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
70 lines
1.6 KiB
Makefile
70 lines
1.6 KiB
Makefile
# Copyright 2014 Google Inc. All Rights Reserved.
|
|
|
|
# gMock builds 2 libraries: libgmock and libgmock_main. libgmock contains most
|
|
# of the code and libgmock_main just provides a common main to run the test.
|
|
# (i.e. If you link against libgmock_main you shouldn't provide a main() entry
|
|
# point. If you link against libgmock_main, do not also link against
|
|
# libgtest_main, as libgmock_main is a superset of libgtest_main, and they will
|
|
# conflict in subtle ways.)
|
|
#
|
|
# We build these 2 libraries for the target device only.
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
libgmock_target_includes := \
|
|
$(LOCAL_PATH)/.. \
|
|
$(LOCAL_PATH)/../include \
|
|
$(TOP)/external/gtest/include \
|
|
|
|
libgmock_host_includes := \
|
|
$(LOCAL_PATH)/.. \
|
|
$(LOCAL_PATH)/../include \
|
|
$(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
|
|
|
|
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
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|