commit 038ac694b36de2b081e62fcfb9b5f4a8c918c533
author Christopher Ferris <cferris@google.com> Thu Oct 31 16:25:04 2013 -0700
committer Christopher Ferris <cferris@google.com> Thu Jan 09 15:09:13 2014 -0800
tree bde917eef3e385029bee6bd87682705a709ef331
parent b0751101b090a8732c62ad261fa44e5d6a69a2cc

Move CallStack to libbacktrace.

Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.

(cherry picked from commit 9b0e074c6d38143e01616404a08b0c7aa992f3c3)

Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 720443e..1710d36 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -116,10 +116,12 @@
 	libcutils
 
 LOCAL_SHARED_LIBRARIES := \
-        libcorkscrew \
+        libbacktrace \
         liblog \
         libdl
 
+include external/stlport/libstlport.mk
+
 LOCAL_MODULE:= libutils
 include $(BUILD_STATIC_LIBRARY)
 
@@ -129,10 +131,12 @@
 LOCAL_MODULE:= libutils
 LOCAL_WHOLE_STATIC_LIBRARIES := libutils
 LOCAL_SHARED_LIBRARIES := \
-        liblog \
+        libbacktrace \
         libcutils \
         libdl \
-        libcorkscrew
+        liblog \
+
+include external/stlport/libstlport.mk
 
 include $(BUILD_SHARED_LIBRARY)