From b50af2bc6076eb2406922f17df6daff0eb5b6a35 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 26 Sep 2014 10:37:30 -0700
Subject: [PATCH] Don't manually link stlport.

Change-Id: I60d2bc868fb9052f120103e9675046ef54f510d0
---
 libcutils/tests/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index 2b3a9ee51..76db5b13a 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -41,9 +41,9 @@ LOCAL_STATIC_LIBRARIES := \
     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