commit be0d295da912076239a1e112c4b7b94be10cf7af
author Dan Albert <danalbert@google.com> Fri Sep 26 19:45:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 19:45:28 2014 +0000
tree bd6d326031656e18a037e22b48990ed51783b470
parent 2d687fe3d8af29e79ee13e5d6c3d71113d6f575a
parent 19d686ee9340c81c23083fc30bc012f7f6ed5028

am 19d686ee: Merge "Don\'t manually link stlport."

* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
  Don't manually link stlport.

libcutils/tests/Android.mk

diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index 2b3a9ee..76db5b1 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -41,9 +41,9 @@
     libc \
     libcutils \
     liblog \
-    libstlport_static \
     libutils \
 
+LOCAL_CXX_STL := stlport_static
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64