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

Merge "Get gtest includes from the exported headers."

Browse Source 
am: f8b170dc52

* commit 'f8b170dc52575f16a63bfd6b6710efb46580c8b2':
  Get gtest includes from the exported headers.
This commit is contained in:
Dan Albert
2016-03-04 22:34:39 +00:00
committed by android-build-merger
parent 058ebbc1cc f8b170dc52
commit 1bbd4dac85
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/host_test_internal.mk
View File

@@ -9,6 +9,5 @@ LOCAL_CFLAGS_darwin += -DGTEST_OS_LINUX
LOCAL_LDLIBS_darwin += -lpthread
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include
LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host

2
core/target_test_internal.mk
View File

@@ -4,8 +4,6 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
LOCAL_C_INCLUDES += external/gtest/include
ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else