Merge "Revert "Unbundle libstlport with NDK r4.""
diff --git a/Android.mk b/Android.mk
index b157044..a1bdb50 100755
--- a/Android.mk
+++ b/Android.mk
@@ -52,11 +52,6 @@
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-endif
-
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
@@ -70,10 +65,5 @@
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-endif
-
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
diff --git a/libstlport.mk b/libstlport.mk
index f9d696f..571e769 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -1,17 +1,7 @@
# Add a couple include paths to use stlport.
-ifdef LOCAL_NDK_VERSION
-stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
-LOCAL_C_INCLUDES := \
- $(stlport_NDK_VERSION_ROOT) \
- external/stlport/stlport \
- $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS += -DBUILD_WITH_NDK=1
-else
# Make sure bionic is first so we can include system headers.
LOCAL_C_INCLUDES := \
bionic \
external/stlport/stlport \
$(LOCAL_C_INCLUDES)
-endif
diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
index d342ada..59ed525 100644
--- a/stlport/stl/config/_android.h
+++ b/stlport/stl/config/_android.h
@@ -54,17 +54,6 @@
#define _STLP_NO_VENDOR_MATH_L 1
// Define how to include our native headers.
-#ifdef BUILD_WITH_NDK
-
-#define _STLP_NATIVE_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_C_HEADER(header) <../include/header>
-#define _STLP_NATIVE_CPP_C_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <usr/include/header>
-
-#else
-
#define _STLP_NATIVE_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_C_HEADER(header) <../include/header>
#define _STLP_NATIVE_CPP_C_HEADER(header) <libstdc++/include/header>
@@ -72,8 +61,6 @@
#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <libstdc++/include/header>
-#endif
-
// Include most of the gcc settings.
#include <stl/config/_gcc.h>
