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

am 67020d23: Merge "Link libgtest_main before libgtest"

Browse Source 
* commit '67020d2338dd51af5daa3479624acaa494be51a9':
  Link libgtest_main before libgtest
This commit is contained in:
Colin Cross
2015-09-25 23:38:29 +00:00
committed by Android Git Automerger
parent ba9bc4d70f 67020d2338
commit cf26cbfb48
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_test_internal.mk
View File

@@ -11,4 +11,4 @@ LOCAL_LDLIBS_darwin += -lpthread
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include LOCAL_C_INCLUDES += external/gtest/include
LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host

4
core/target_test_internal.mk
View File

@@ -7,9 +7,9 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
LOCAL_C_INCLUDES += external/gtest/include LOCAL_C_INCLUDES += external/gtest/include
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else else
LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk LOCAL_STATIC_LIBRARIES += libgtest_main_ndk libgtest_ndk
endif endif
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH