am 0ec050af: am f581c1ea: Unbundle libstlport with NDK r4.
Merge commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c' into gingerbread-plus-aosp
* commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c':
Unbundle libstlport with NDK r4.
diff --git a/Android.mk b/Android.mk
index e18eea7..861cb15 100755
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,9 @@
LOCAL_CFLAGS := -D_GNU_SOURCE
LOCAL_CPPFLAGS := -fuse-cxa-atexit
+LOCAL_NDK_VERSION := 4
+LOCAL_SDK_VERSION := 8
+
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/libstlport.mk b/libstlport.mk
index 43b5124..8cc0130 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -5,8 +5,18 @@
$(error STLPort not suitable for the simulator! $(LOCAL_PATH))
endif
+ifdef LOCAL_NDK_VERSION
+stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/$(BUILD_OS)/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 4480d47..82a8907 100644
--- a/stlport/stl/config/_android.h
+++ b/stlport/stl/config/_android.h
@@ -54,6 +54,17 @@
#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>
@@ -61,6 +72,8 @@
#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>
