Merge "Add /backward to gnustl include path and a testcase"
diff --git a/sources/cxx-stl/gnu-libstdc++/Android.mk b/sources/cxx-stl/gnu-libstdc++/Android.mk
index 98e1a2d..65c911b 100644
--- a/sources/cxx-stl/gnu-libstdc++/Android.mk
+++ b/sources/cxx-stl/gnu-libstdc++/Android.mk
@@ -9,7 +9,10 @@
$(if $(filter rtti,$(APP_GNUSTL_FORCE_CPP_FEATURES)),-frtti))
# Include path to export
-gnustl_exported_c_includes := $(LOCAL_PATH)/$(TOOLCHAIN_VERSION)/include $(LOCAL_PATH)/$(TOOLCHAIN_VERSION)/libs/$(TARGET_ARCH_ABI)/include
+gnustl_exported_c_includes := \
+ $(LOCAL_PATH)/$(TOOLCHAIN_VERSION)/include \
+ $(LOCAL_PATH)/$(TOOLCHAIN_VERSION)/libs/$(TARGET_ARCH_ABI)/include \
+ $(LOCAL_PATH)/$(TOOLCHAIN_VERSION)/include/backward
include $(CLEAR_VARS)
LOCAL_MODULE := gnustl_static
diff --git a/tests/build/issue53404-backward-compatibility/jni/Android.mk b/tests/build/issue53404-backward-compatibility/jni/Android.mk
new file mode 100644
index 0000000..3bbc4f8
--- /dev/null
+++ b/tests/build/issue53404-backward-compatibility/jni/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := issue53404-backward-compatibility
+LOCAL_SRC_FILES := issue53404-backward-compatibility.cpp
+LOCAL_CFLAGS := -Wno-deprecated
+include $(BUILD_EXECUTABLE)
diff --git a/tests/build/issue53404-backward-compatibility/jni/Application.mk b/tests/build/issue53404-backward-compatibility/jni/Application.mk
new file mode 100644
index 0000000..d736092
--- /dev/null
+++ b/tests/build/issue53404-backward-compatibility/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := all
+APP_STL := gnustl_static
\ No newline at end of file
diff --git a/tests/build/issue53404-backward-compatibility/jni/issue53404-backward-compatibility.cpp b/tests/build/issue53404-backward-compatibility/jni/issue53404-backward-compatibility.cpp
new file mode 100644
index 0000000..131986d
--- /dev/null
+++ b/tests/build/issue53404-backward-compatibility/jni/issue53404-backward-compatibility.cpp
@@ -0,0 +1,5 @@
+#include <ext/hash_map>
+int main()
+{
+ return 0;
+}
