StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t use GTEST_OS_LINUX on Darwin"

Browse Source 
am: 439f4dd189

* commit '439f4dd1895eef8684b3257fe5631a45d51635d6':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
This commit is contained in:
Dan Willemsen
2016-05-13 22:33:48 +00:00
committed by android-build-merger
parent 5bd91e69f7 439f4dd189
commit 33b3051784
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_test_internal.mk
View File

@@ -5,7 +5,7 @@
LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS LOCAL_CFLAGS_windows += -DGTEST_OS_WINDOWS
LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX LOCAL_CFLAGS_linux += -DGTEST_OS_LINUX
LOCAL_LDLIBS_linux += -lpthread LOCAL_LDLIBS_linux += -lpthread
LOCAL_CFLAGS_darwin += -DGTEST_OS_LINUX LOCAL_CFLAGS_darwin += -DGTEST_OS_MAC
LOCAL_LDLIBS_darwin += -lpthread LOCAL_LDLIBS_darwin += -lpthread
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g