Move some tests to libc++.

Bug: 15193147
Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
This commit is contained in:
Dan Albert 2014-11-10 14:45:49 -08:00
parent 2c0839e9db
commit e3cccbfd47
2 changed files with 3 additions and 2 deletions

View file

@ -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

View file

@ -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 \