diff options
| author | Elliott Hughes <enh@google.com> | 2016-07-22 21:31:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 21:31:13 +0000 |
| commit | 0d5099e3a7c8872fedeb30d9dcacccf4b035540e (patch) | |
| tree | 174fbd352ce6becfb0a14dc6460d50e39b314216 | |
| parent | 97d528711d20c4c1975f204dad114d48008198eb (diff) | |
| parent | dbda419424a76678a7af3bde8cf955193a916fe7 (diff) | |
| download | gmock-0d5099e3a7c8872fedeb30d9dcacccf4b035540e.tar.gz | |
Merge \"Support gmock for Windows.\"
am: dbda419424
Change-Id: I8f9ea08579df7909e4caff8f0402661c07ca07c4
| -rw-r--r-- | src/Android.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Android.mk b/src/Android.mk index 85e6995..1248fa4 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -18,10 +18,6 @@ # contains most of the code (assertions...) and libgmock_main just # provide a common main to run the test (ie if you link against # libgmock_main you won't/should not provide a main() entry point. -# -# We build these 2 libraries for the target device and for the host if -# it is running linux and using ASTL. -# # TODO: The targets below have some redundancy. Check if we cannot # condense them using function(s) for the common code. @@ -95,15 +91,15 @@ LOCAL_MODULE := libgmock_host LOCAL_MULTILIB := both LOCAL_SANITIZE := never LOCAL_RTTI_FLAG := -frtti +LOCAL_MODULE_HOST_OS := linux darwin windows include $(BUILD_HOST_STATIC_LIBRARY) ####################################################################### -# gmock_main lib target +# gmock_main lib host include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gmock_main.cc LOCAL_C_INCLUDES := $(libgmock_host_includes) @@ -112,6 +108,7 @@ LOCAL_CFLAGS += $(libgmock_cflags) LOCAL_MODULE := libgmock_main_host LOCAL_MULTILIB := both LOCAL_SANITIZE := never +LOCAL_MODULE_HOST_OS := linux darwin windows include $(BUILD_HOST_STATIC_LIBRARY) @@ -120,7 +117,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gmock-all.cc LOCAL_C_INCLUDES := $(libgmock_target_includes) |