commit 7bc49a16e80bd6306fc467e27c019aa72b9a2701
author Dan Albert <danalbert@google.com> Fri May 30 19:40:58 2014 +0000
committer Dan Albert <danalbert@google.com> Fri May 30 19:40:58 2014 +0000
tree 49a8bcc39396bd60ceec62735c02c7a82eccbaf6
parent dc133729b0bc983c6ecfecdb06ac8b433ea31350

Revert "Move libutils to libc++"

Causes issues in the unbundled branches.

This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 923d690..1c48619 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -108,11 +108,11 @@
 	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 @@
 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)