1 files changed, 9 insertions, 65 deletions
diff --git a/Android.mk b/Android.mk
index e32a3c6..e33c1bd 100755
--- a/Android.mk
+++ b/Android.mk
@@ -14,76 +14,20 @@ STLPORT_WHITELIST := \
     tilapia \
 
 ifneq (,$(filter $(TARGET_DEVICE),$(STLPORT_WHITELIST)))
-LOCAL_PATH := $(call my-dir)
-
-libstlport_src_files := \
-	src/dll_main.cpp \
-	src/fstream.cpp \
-	src/strstream.cpp \
-	src/sstream.cpp \
-	src/ios.cpp \
-	src/stdio_streambuf.cpp \
-	src/istream.cpp \
-	src/ostream.cpp \
-	src/iostream.cpp \
-	src/codecvt.cpp \
-	src/collate.cpp \
-	src/ctype.cpp \
-	src/monetary.cpp \
-	src/num_get.cpp \
-	src/num_put.cpp \
-	src/num_get_float.cpp \
-	src/num_put_float.cpp \
-	src/numpunct.cpp \
-	src/time_facets.cpp \
-	src/messages.cpp \
-	src/locale.cpp \
-	src/locale_impl.cpp \
-	src/locale_catalog.cpp \
-	src/facets_byname.cpp \
-	src/complex.cpp \
-	src/complex_io.cpp \
-	src/complex_trig.cpp \
-	src/string.cpp \
-	src/bitset.cpp \
-	src/allocators.cpp \
-	src/c_locale.c \
-	src/cxa.c \
-
-libstlport_c_includes := \
-	external/stlport/stlport \
-	bionic \
-        bionic/libstdc++/include \
 
-libstlport_cflags := -D_GNU_SOURCE
-libstlport_cppflags := -fuse-cxa-atexit
+LOCAL_PATH := $(call my-dir)
 
-##########################################
 include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(libstlport_src_files)
-
 LOCAL_MODULE := libstlport
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_CFLAGS := $(libstlport_cflags)
-LOCAL_CPPFLAGS := $(libstlport_cppflags)
-LOCAL_C_INCLUDES := $(libstlport_c_includes)
-LOCAL_CXX_STL := none
-LOCAL_SHARED_LIBRARIES := libstdc++
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_SRC_FILES := $(TARGET_DEVICE)/$(LOCAL_MODULE).so
 
-##########################################
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(libstlport_src_files)
+ifeq ($(TARGET_IS_64_BIT),true)
+LOCAL_MULTILIB := both
+LOCAL_SRC_FILES_32 := $(TARGET_DEVICE)/32/$(LOCAL_MODULE).so
+endif
 
-LOCAL_MODULE := libstlport_static
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include $(BUILD_PREBUILT)
 
-LOCAL_CFLAGS := $(libstlport_cflags)
-LOCAL_CPPFLAGS := $(libstlport_cppflags)
-LOCAL_C_INCLUDES := $(libstlport_c_includes)
-LOCAL_CXX_STL := none
-include $(BUILD_STATIC_LIBRARY)
 endif