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

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 68223a2..9f25022 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -158,7 +158,7 @@
   # TODO: clean up the compilers and remove this.
   LOCAL_CFLAGS += -Wno-unused-parameter
 
-  LOCAL_SHARED_LIBRARIES := liblog
+  LOCAL_SHARED_LIBRARIES += liblog
   ifeq ($$(art_ndebug_or_debug),debug)
     ifeq ($$(art_target_or_host),target)
       LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
@@ -181,9 +181,7 @@
 
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime
 
-  ifeq ($$(art_target_or_host),target)
-    LOCAL_SHARED_LIBRARIES += libstlport
-  else # host
+  ifeq ($$(art_target_or_host),host)
     LOCAL_LDLIBS := -ldl -lpthread
   endif
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk