p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Get gtest includes from the exported headers."

This commit is contained in:
Dan Albert 2016-03-04 22:30:58 +00:00 committed by Gerrit Code Review
parent dfa0d1063a e5ecdc967d
commit f8b170dc52
2 changed files with 0 additions and 3 deletions
Show Stats 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