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

Rely only on NDK libs if built against the NDK.

Browse Source 
Change-Id: Icf0b690181669830d3b2d19aa5b7dd6815b44bfc
This commit is contained in:
Ulas Kirazci
2012-09-26 17:19:01 -07:00
parent bf36578bf2
commit 478a3808f8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/native_test.mk
View File

@@ -4,12 +4,16 @@
########################################### ###########################################
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
LOCAL_C_INCLUDES += external/gtest/include
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
ifndef LOCAL_SDK_VERSION
LOCAL_C_INCLUDES += bionic \ LOCAL_C_INCLUDES += bionic \
bionic/libstdc++/include \ bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport external/stlport/stlport
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
endif
ifndef LOCAL_MODULE_PATH ifndef LOCAL_MODULE_PATH
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)