commit 025218c7e4330a4942b14f9a8f1f68bd3390261c
author Elliott Hughes <enh@google.com> Tue Jul 30 17:13:06 2013 -0700
committer Elliott Hughes <enh@google.com> Tue Jul 30 17:13:06 2013 -0700
tree 8bfc33d0dcc9d5687845cea2c8d24a5020b1aa3a
parent 2724776ad521eebb1c7f0e4be56d6e6ab4764f86

Clean up stlport usage.

Change-Id: I133cd88f1da37f6f801a9e07a78ae23b671cf4f1

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 4638e78..7734aa5 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -329,10 +329,10 @@
     endif
   endif
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
-  LOCAL_SHARED_LIBRARIES := liblog libnativehelper
+  LOCAL_SHARED_LIBRARIES += liblog libnativehelper
   LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
   ifeq ($$(art_target_or_host),target)
-    LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl libselinux
+    LOCAL_SHARED_LIBRARIES += libcutils libz libdl libselinux
   else # host
     LOCAL_STATIC_LIBRARIES += libcutils
     LOCAL_SHARED_LIBRARIES += libz-host