diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-21 18:41:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-21 18:41:00 +0000 |
| commit | ab64e2aa4c8cd87e1a588018d57ede5533be0a23 (patch) | |
| tree | fc3411b0122add4bc628d1ac7531cc569311e88d | |
| parent | d82e727db9b5b6343a3808a025884bfabd6bb4ec (diff) | |
| parent | be7f2ef983ab49c9c3da8a872661376ea7672acf (diff) | |
| download | gtest-ab64e2aa4c8cd87e1a588018d57ede5533be0a23.tar.gz | |
Merge "Fixes gtest_libc++ on Mac by moving to clang"
| -rw-r--r-- | src/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index e257d42..5d2520a 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -107,6 +107,7 @@ ifeq (,$(TARGET_BUILD_APPS)) include $(CLEAR_VARS) +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) @@ -121,6 +122,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) @@ -135,6 +137,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) @@ -149,6 +152,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) |