Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8b170dc authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Get gtest includes from the exported headers."

parents dfa0d106 e5ecdc96

core/host_test_internal.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

core/target_test_internal.mk

+0 −2
Original line number Diff line number Diff line
@@ -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