From e3cccbfd4776644c7cb705d52f51ca948df34f9a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 10 Nov 2014 14:45:49 -0800 Subject: Move some tests to libc++. Bug: 15193147 Change-Id: I93244e4a5d0c751056910ec8005a92401d305716 --- libcutils/tests/Android.mk | 4 +++- libion/tests/Android.mk | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index 76db5b1..afab3cc 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -42,8 +42,10 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ liblog \ libutils \ + libc++abi \ + libdl \ -LOCAL_CXX_STL := stlport_static +LOCAL_CXX_STL := libc++_static LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk index 8dc7f9d..abf527a 100644 --- a/libion/tests/Android.mk +++ b/libion/tests/Android.mk @@ -21,7 +21,6 @@ LOCAL_MODULE := ion-unit-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers LOCAL_SHARED_LIBRARIES += libion -LOCAL_STATIC_LIBRARIES += libgtest_main LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers LOCAL_SRC_FILES := \ ion_test_fixture.cpp \ -- cgit v1.1