diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 21:41:14 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-11 21:42:27 -0800 |
| commit | 1d3b492bde061123087f73ebbe289a0037062d1f (patch) | |
| tree | dadcd8f37f3906b349829e0266cd4920102d9ebe /libion | |
| parent | 5c7e2e603079c611b99302e5898b443440f2d9d7 (diff) | |
| download | system_core-1d3b492bde061123087f73ebbe289a0037062d1f.zip system_core-1d3b492bde061123087f73ebbe289a0037062d1f.tar.gz system_core-1d3b492bde061123087f73ebbe289a0037062d1f.tar.bz2 | |
Revert "Move some tests to libc++."
The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.
This reverts commit e3cccbfd4776644c7cb705d52f51ca948df34f9a.
Diffstat (limited to 'libion')
| -rw-r--r-- | libion/tests/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk index abf527a..8dc7f9d 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 \ |