diff options
| -rw-r--r-- | libcutils/tests/Android.mk | 4 | ||||
| -rw-r--r-- | libion/tests/Android.mk | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index afab3cca3..76db5b13a 100644 --- a/libcutils/tests/Android.mk +++ b/libcutils/tests/Android.mk @@ -42,10 +42,8 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ liblog \ libutils \ - libc++abi \ - libdl \ -LOCAL_CXX_STL := libc++_static +LOCAL_CXX_STL := stlport_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 abf527ad6..8dc7f9d1d 100644 --- a/libion/tests/Android.mk +++ b/libion/tests/Android.mk @@ -21,6 +21,7 @@ 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 \ |