diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-14 14:16:47 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-16 11:22:44 -0700 |
| commit | 965bfefb6b5f7a89d10fa5c03d06591e99314c4d (patch) | |
| tree | de95cc5fb6c26e7097aea1dfc573853c5bc19e9e /core/target_test_internal.mk | |
| parent | c0f10644bf877fae44e8aa5ebfff41f0e27af197 (diff) | |
| download | build-965bfefb6b5f7a89d10fa5c03d06591e99314c4d.zip build-965bfefb6b5f7a89d10fa5c03d06591e99314c4d.tar.gz build-965bfefb6b5f7a89d10fa5c03d06591e99314c4d.tar.bz2 | |
Use libc++ versions of gtest libs when needed
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
Diffstat (limited to 'core/target_test_internal.mk')
| -rw-r--r-- | core/target_test_internal.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index 7b99678..60a7c9e 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -5,6 +5,9 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_C_INCLUDES += external/gtest/include +ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),) +LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx +else LOCAL_STATIC_LIBRARIES += libgtest libgtest_main ifndef LOCAL_SDK_VERSION @@ -14,6 +17,7 @@ LOCAL_C_INCLUDES += bionic \ LOCAL_SHARED_LIBRARIES += libstlport LOCAL_STATIC_LIBRARIES += libstdc++ endif +endif ifndef LOCAL_MODULE_PATH LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) |