commit 6f8030c56503acf53a58e7abb51cbdc25845b57b
author Dan Albert <danalbert@google.com> Fri May 30 19:01:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 30 19:01:45 2014 +0000
tree aeff9821f00ea2cc5b00cd5c270ef1964c840f97
parent 3051ddd13a45e61b2ace9459a0657ddf892c39db
parent 58f4a09bb4375c2f7b85ec14449a0588e85e126a

am 58f4a09b: am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"

* commit '58f4a09bb4375c2f7b85ec14449a0588e85e126a':
  Move libutils to libc++

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 1fef049..ec5dcba 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -109,11 +109,11 @@
 	libcutils
 
 LOCAL_SHARED_LIBRARIES := \
-        libbacktrace \
+        libbacktrace_libc++ \
         liblog \
         libdl
 
-include external/stlport/libstlport.mk
+include external/libcxx/libcxx.mk
 
 LOCAL_MODULE:= libutils
 include $(BUILD_STATIC_LIBRARY)
@@ -124,12 +124,12 @@
 LOCAL_MODULE:= libutils
 LOCAL_WHOLE_STATIC_LIBRARIES := libutils
 LOCAL_SHARED_LIBRARIES := \
-        libbacktrace \
+        libbacktrace_libc++ \
         libcutils \
         libdl \
         liblog \
 
-include external/stlport/libstlport.mk
+include external/libcxx/libcxx.mk
 
 include $(BUILD_SHARED_LIBRARY)
 

libutils/tests/Android.mk

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