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 /libcutils/tests | |
| 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 'libcutils/tests')
| -rw-r--r-- | libcutils/tests/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk index afab3cc..76db5b1 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 |