diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 03:43:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 03:43:52 +0000 |
| commit | e924cced8e816dc655833d49b61a627814c57645 (patch) | |
| tree | 3a2aec49a79ffa0e5ae498be4a471c8d4c0fd1eb | |
| parent | c3939f08dafd5d0f24a9a8128e42bebde368b304 (diff) | |
| parent | 498c8135b46b976806fb4e335071c11fc2c51776 (diff) | |
| download | system_core-e924cced8e816dc655833d49b61a627814c57645.zip system_core-e924cced8e816dc655833d49b61a627814c57645.tar.gz system_core-e924cced8e816dc655833d49b61a627814c57645.tar.bz2 | |
am 498c8135: am 7d196df6: Merge "Move some tests to libc++."
* commit '498c8135b46b976806fb4e335071c11fc2c51776':
Move some tests to libc++.
| -rw-r--r-- | libcutils/tests/Android.mk | 4 | ||||
| -rw-r--r-- | 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 \ |