commit e8f90ca60d65f5a0542b77f8f517c4fb80da2e52
author Dan Albert <danalbert@google.com> Fri May 30 20:17:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 30 20:17:32 2014 +0000
tree b8d170d3028bddddf5c3f591e4542103376539ea
parent 36f536fc7b88fe21a974bce6fed565bc622b5bc2
parent 570cd46d14645f622e9972671308fdb4f2425292

am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"

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)
 

libutils/tests/Android.mk

diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk
index da51a94..caedaff 100644
--- a/libutils/tests/Android.mk
+++ b/libutils/tests/Android.mk
@@ -18,6 +18,11 @@
     liblog \
     libcutils \
     libutils \
+    libstlport
+
+static_libraries := \
+    libgtest \
+    libgtest_main
 
 $(foreach file,$(test_src_files), \
     $(eval include $(CLEAR_VARS)) \