Merge "Add a test case for mixed ARM and thumb LTO."
diff --git a/tests/build/arm_thumb_lto/jni/Android.mk b/tests/build/arm_thumb_lto/jni/Android.mk
new file mode 100644
index 0000000..fa4d56f
--- /dev/null
+++ b/tests/build/arm_thumb_lto/jni/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := foo
+LOCAL_SRC_FILES := foo.cpp bar.cpp.arm
+LOCAL_CFLAGS := -flto
+LOCAL_LDFLAGS := -flto
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/build/arm_thumb_lto/jni/bar.cpp b/tests/build/arm_thumb_lto/jni/bar.cpp
new file mode 100644
index 0000000..e425999
--- /dev/null
+++ b/tests/build/arm_thumb_lto/jni/bar.cpp
@@ -0,0 +1 @@
+void bar() {}
diff --git a/tests/build/arm_thumb_lto/jni/foo.cpp b/tests/build/arm_thumb_lto/jni/foo.cpp
new file mode 100644
index 0000000..85e6cd8
--- /dev/null
+++ b/tests/build/arm_thumb_lto/jni/foo.cpp
@@ -0,0 +1 @@
+void foo() {}