From 7bc49a16e80bd6306fc467e27c019aa72b9a2701 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 30 May 2014 19:40:58 +0000 Subject: [PATCH] Revert "Move libutils to libc++" Causes issues in the unbundled branches. This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350. Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a --- libutils/Android.mk | 8 ++++---- libutils/tests/Android.mk | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libutils/Android.mk b/libutils/Android.mk index 923d6906a..1c4861902 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \ libcutils LOCAL_SHARED_LIBRARIES := \ - libbacktrace_libc++ \ + libbacktrace \ liblog \ libdl -include external/libcxx/libcxx.mk +include external/stlport/libstlport.mk LOCAL_MODULE:= libutils include $(BUILD_STATIC_LIBRARY) @@ -123,12 +123,12 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libutils LOCAL_WHOLE_STATIC_LIBRARIES := libutils LOCAL_SHARED_LIBRARIES := \ - libbacktrace_libc++ \ + libbacktrace \ libcutils \ libdl \ liblog \ -include external/libcxx/libcxx.mk +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk index da51a9498..caedaffc0 100644 --- a/libutils/tests/Android.mk +++ b/libutils/tests/Android.mk @@ -18,6 +18,11 @@ shared_libraries := \ liblog \ libcutils \ libutils \ + libstlport + +static_libraries := \ + libgtest \ + libgtest_main $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \