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

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index 54f9926..fe540c0 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -58,7 +58,7 @@
   LOCAL_MODULE_TAGS := optional
   LOCAL_SRC_FILES := $$(art_source)
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime $$(art_c_includes)
-  LOCAL_SHARED_LIBRARIES := $$(art_shared_libraries) # libnativehelper
+  LOCAL_SHARED_LIBRARIES += $$(art_shared_libraries) # libnativehelper
 
   ifeq ($$(art_ndebug_or_debug),ndebug)
     LOCAL_MODULE := $$(art_executable)
@@ -91,10 +91,6 @@
     LOCAL_SHARED_LIBRARIES += libartd
   endif
 
-  ifeq ($$(art_target_or_host),target)
-    LOCAL_SHARED_LIBRARIES += libstlport
-  endif
-
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.executable.mk
 

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 6a73fc0..ee1115a 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -106,9 +106,9 @@
   endif
   LOCAL_SRC_FILES := $$(art_gtest_filename) runtime/common_test.cc
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime art/compiler
-  LOCAL_SHARED_LIBRARIES := libartd-compiler libartd
+  LOCAL_SHARED_LIBRARIES += libartd-compiler libartd
   # dex2oatd is needed to go libartd-compiler and libartd
-  LOCAL_REQUIRED_MODULES := dex2oatd 
+  LOCAL_REQUIRED_MODULES := dex2oatd
 
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk
@@ -123,7 +123,7 @@
   ifeq ($$(art_target_or_host),target)
     LOCAL_CLANG := $(ART_TARGET_CLANG)
     LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
-    LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz libcutils
+    LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils
     LOCAL_STATIC_LIBRARIES += libgtest
     LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT)
     include $(LLVM_DEVICE_BUILD_MK)

build/Android.libarttest.mk

diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 54a3859..4fb2bbf 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -39,14 +39,14 @@
     LOCAL_MODULE_TAGS := tests
   endif
   LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
-  LOCAL_SHARED_LIBRARIES := libartd
+  LOCAL_SHARED_LIBRARIES += libartd
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime
   LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/build/Android.libarttest.mk
   ifeq ($$(art_target_or_host),target)
     LOCAL_CLANG := $(ART_TARGET_CLANG)
     LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
-    LOCAL_SHARED_LIBRARIES += libdl libstlport
+    LOCAL_SHARED_LIBRARIES += libdl
     LOCAL_STATIC_LIBRARIES := libgtest
     LOCAL_MODULE_PATH := $(ART_TEST_OUT)
     include $(BUILD_SHARED_LIBRARY)