Merge "Move the java test directory under rs/test"
diff --git a/tests/cpp_api/Android.mk b/tests/cpp_api/Android.mk
new file mode 100644
index 0000000..95904a8
--- /dev/null
+++ b/tests/cpp_api/Android.mk
@@ -0,0 +1,4 @@
+LOCAL_PATH:=$(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/tests/cppallocation/Android.mk b/tests/cpp_api/cppallocation/Android.mk
similarity index 100%
rename from tests/cppallocation/Android.mk
rename to tests/cpp_api/cppallocation/Android.mk
diff --git a/tests/cppallocation/compute.cpp b/tests/cpp_api/cppallocation/compute.cpp
similarity index 100%
rename from tests/cppallocation/compute.cpp
rename to tests/cpp_api/cppallocation/compute.cpp
diff --git a/tests/cppallocation/multiply.rs b/tests/cpp_api/cppallocation/multiply.rs
similarity index 100%
rename from tests/cppallocation/multiply.rs
rename to tests/cpp_api/cppallocation/multiply.rs
diff --git a/tests/cppbasic-getpointer/Android.mk b/tests/cpp_api/cppbasic-getpointer/Android.mk
similarity index 100%
rename from tests/cppbasic-getpointer/Android.mk
rename to tests/cpp_api/cppbasic-getpointer/Android.mk
diff --git a/tests/cppbasic-getpointer/compute.cpp b/tests/cpp_api/cppbasic-getpointer/compute.cpp
similarity index 100%
rename from tests/cppbasic-getpointer/compute.cpp
rename to tests/cpp_api/cppbasic-getpointer/compute.cpp
diff --git a/tests/cppbasic-getpointer/mono.rs b/tests/cpp_api/cppbasic-getpointer/mono.rs
similarity index 100%
rename from tests/cppbasic-getpointer/mono.rs
rename to tests/cpp_api/cppbasic-getpointer/mono.rs
diff --git a/tests/cppbasic-shared/Android.mk b/tests/cpp_api/cppbasic-shared/Android.mk
similarity index 100%
rename from tests/cppbasic-shared/Android.mk
rename to tests/cpp_api/cppbasic-shared/Android.mk
diff --git a/tests/cppbasic-shared/compute.cpp b/tests/cpp_api/cppbasic-shared/compute.cpp
similarity index 100%
rename from tests/cppbasic-shared/compute.cpp
rename to tests/cpp_api/cppbasic-shared/compute.cpp
diff --git a/tests/cppbasic-shared/mono.rs b/tests/cpp_api/cppbasic-shared/mono.rs
similarity index 100%
rename from tests/cppbasic-shared/mono.rs
rename to tests/cpp_api/cppbasic-shared/mono.rs
diff --git a/tests/cppbasic/Android.mk b/tests/cpp_api/cppbasic/Android.mk
similarity index 100%
rename from tests/cppbasic/Android.mk
rename to tests/cpp_api/cppbasic/Android.mk
diff --git a/tests/cppbasic/compute.cpp b/tests/cpp_api/cppbasic/compute.cpp
similarity index 100%
rename from tests/cppbasic/compute.cpp
rename to tests/cpp_api/cppbasic/compute.cpp
diff --git a/tests/cppbasic/mono.rs b/tests/cpp_api/cppbasic/mono.rs
similarity index 100%
rename from tests/cppbasic/mono.rs
rename to tests/cpp_api/cppbasic/mono.rs
diff --git a/tests/cppf16/Android.mk b/tests/cpp_api/cppf16/Android.mk
similarity index 100%
rename from tests/cppf16/Android.mk
rename to tests/cpp_api/cppf16/Android.mk
diff --git a/tests/cppf16/compute.cpp b/tests/cpp_api/cppf16/compute.cpp
similarity index 100%
rename from tests/cppf16/compute.cpp
rename to tests/cpp_api/cppf16/compute.cpp
diff --git a/tests/cppstrided/Android.mk b/tests/cpp_api/cppstrided/Android.mk
similarity index 100%
rename from tests/cppstrided/Android.mk
rename to tests/cpp_api/cppstrided/Android.mk
diff --git a/tests/cppstrided/compute.cpp b/tests/cpp_api/cppstrided/compute.cpp
similarity index 100%
rename from tests/cppstrided/compute.cpp
rename to tests/cpp_api/cppstrided/compute.cpp
diff --git a/tests/cppstrided/multiply.rs b/tests/cpp_api/cppstrided/multiply.rs
similarity index 100%
rename from tests/cppstrided/multiply.rs
rename to tests/cpp_api/cppstrided/multiply.rs
diff --git a/tests/latency/Android.mk b/tests/cpp_api/latency/Android.mk
similarity index 100%
rename from tests/latency/Android.mk
rename to tests/cpp_api/latency/Android.mk
diff --git a/tests/latency/latency.cpp b/tests/cpp_api/latency/latency.cpp
similarity index 100%
rename from tests/latency/latency.cpp
rename to tests/cpp_api/latency/latency.cpp
diff --git a/tests/latency/latency.rs b/tests/cpp_api/latency/latency.rs
similarity index 100%
rename from tests/latency/latency.rs
rename to tests/cpp_api/latency/latency.rs
diff --git a/tests/typecheck/Android.mk b/tests/cpp_api/typecheck/Android.mk
similarity index 100%
rename from tests/typecheck/Android.mk
rename to tests/cpp_api/typecheck/Android.mk
diff --git a/tests/typecheck/kernels.rs b/tests/cpp_api/typecheck/kernels.rs
similarity index 100%
rename from tests/typecheck/kernels.rs
rename to tests/cpp_api/typecheck/kernels.rs
diff --git a/tests/typecheck/typecheck.cpp b/tests/cpp_api/typecheck/typecheck.cpp
similarity index 100%
rename from tests/typecheck/typecheck.cpp
rename to tests/cpp_api/typecheck/typecheck.cpp