Merge "Add testcase for issue 52819 about failing to force-rebuild stlport"
diff --git a/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Android.mk b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Android.mk
new file mode 100644
index 0000000..9eb8203
--- /dev/null
+++ b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := my_jni_module
+LOCAL_SRC_FILES := my_jni_module.cpp
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Application.mk b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Application.mk
new file mode 100644
index 0000000..925a4ac
--- /dev/null
+++ b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/Application.mk
@@ -0,0 +1,3 @@
+APP_ABI := all
+APP_STL := stlport_shared
+STLPORT_FORCE_REBUILD := true
\ No newline at end of file
diff --git a/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/my_jni_module.cpp b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/my_jni_module.cpp
new file mode 100644
index 0000000..94abb6c
--- /dev/null
+++ b/tests/build/issue52819-STLPORT_FORCE_REBUILD/jni/my_jni_module.cpp
@@ -0,0 +1,4 @@
+int fun(int i)
+{
+ return i;
+}
