ART: More refactor for JVMTI run tests (2/3)

Move refactored tests into their final places. Add a host java
library that includes those test files.

This is a follow-up to CL I740731c3af793521c5a859ef4a1f0ae94d2e1c19
and must be used together with it.

Bug: 32072923
Test: None
Change-Id: I20b6070eb6bdd4b7a0bf42046302bafa10eee54f

29 files changed, 59 insertions, 0 deletions

diff --git a/test/901-hello-ti-agent/src/Main.java b/test/901-hello-ti-agent/src/art/Test901.java
index 26f7399c31..26f7399c31 100644
--- a/test/901-hello-ti-agent/src/Main.java
+++ b/test/901-hello-ti-agent/src/art/Test901.java
diff --git a/test/903-hello-tagging/src/Main.java b/test/903-hello-tagging/src/art/Test903.java
index 1691a947c5..1691a947c5 100644
--- a/test/903-hello-tagging/src/Main.java
+++ b/test/903-hello-tagging/src/art/Test903.java
diff --git a/test/904-object-allocation/src/Main.java b/test/904-object-allocation/src/art/Test904.java
index 31e0c8c1ae..31e0c8c1ae 100644
--- a/test/904-object-allocation/src/Main.java
+++ b/test/904-object-allocation/src/art/Test904.java
diff --git a/test/905-object-free/src/Main.java b/test/905-object-free/src/art/Test905.java
index 1ed7a0eb19..1ed7a0eb19 100644
--- a/test/905-object-free/src/Main.java
+++ b/test/905-object-free/src/art/Test905.java
diff --git a/test/906-iterate-heap/src/Main.java b/test/906-iterate-heap/src/art/Test906.java
index feebf9c118..feebf9c118 100644
--- a/test/906-iterate-heap/src/Main.java
+++ b/test/906-iterate-heap/src/art/Test906.java
diff --git a/test/907-get-loaded-classes/src/Main.java b/test/907-get-loaded-classes/src/art/Test907.java
index d654428819..d654428819 100644
--- a/test/907-get-loaded-classes/src/Main.java
+++ b/test/907-get-loaded-classes/src/art/Test907.java
diff --git a/test/908-gc-start-finish/src/Main.java b/test/908-gc-start-finish/src/art/Test908.java
index ceaa98cd9f..ceaa98cd9f 100644
--- a/test/908-gc-start-finish/src/Main.java
+++ b/test/908-gc-start-finish/src/art/Test908.java
diff --git a/test/910-methods/src/Main.java b/test/910-methods/src/art/Test910.java
index b3490e9518..b3490e9518 100644
--- a/test/910-methods/src/Main.java
+++ b/test/910-methods/src/art/Test910.java
diff --git a/test/911-get-stack-trace/src/AllTraces.java b/test/911-get-stack-trace/src/art/AllTraces.java
index d73f78bba1..d73f78bba1 100644
--- a/test/911-get-stack-trace/src/AllTraces.java
+++ b/test/911-get-stack-trace/src/art/AllTraces.java
diff --git a/test/911-get-stack-trace/src/ControlData.java b/test/911-get-stack-trace/src/art/ControlData.java
index b5f3291f30..b5f3291f30 100644
--- a/test/911-get-stack-trace/src/ControlData.java
+++ b/test/911-get-stack-trace/src/art/ControlData.java
diff --git a/test/911-get-stack-trace/src/Frames.java b/test/911-get-stack-trace/src/art/Frames.java
index b3d81bf9f7..b3d81bf9f7 100644
--- a/test/911-get-stack-trace/src/Frames.java
+++ b/test/911-get-stack-trace/src/art/Frames.java
diff --git a/test/911-get-stack-trace/src/OtherThread.java b/test/911-get-stack-trace/src/art/OtherThread.java
index 675bff55a6..675bff55a6 100644
--- a/test/911-get-stack-trace/src/OtherThread.java
+++ b/test/911-get-stack-trace/src/art/OtherThread.java
diff --git a/test/911-get-stack-trace/src/PrintThread.java b/test/911-get-stack-trace/src/art/PrintThread.java
index de1da9c8a6..de1da9c8a6 100644
--- a/test/911-get-stack-trace/src/PrintThread.java
+++ b/test/911-get-stack-trace/src/art/PrintThread.java
diff --git a/test/911-get-stack-trace/src/Recurse.java b/test/911-get-stack-trace/src/art/Recurse.java
index 438fdfdbba..438fdfdbba 100644
--- a/test/911-get-stack-trace/src/Recurse.java
+++ b/test/911-get-stack-trace/src/art/Recurse.java
diff --git a/test/911-get-stack-trace/src/SameThread.java b/test/911-get-stack-trace/src/art/SameThread.java
index c9afad5570..c9afad5570 100644
--- a/test/911-get-stack-trace/src/SameThread.java
+++ b/test/911-get-stack-trace/src/art/SameThread.java
diff --git a/test/911-get-stack-trace/src/Main.java b/test/911-get-stack-trace/src/art/Test911.java
index 71a5196c22..71a5196c22 100644
--- a/test/911-get-stack-trace/src/Main.java
+++ b/test/911-get-stack-trace/src/art/Test911.java
diff --git a/test/911-get-stack-trace/src/ThreadListTraces.java b/test/911-get-stack-trace/src/art/ThreadListTraces.java
index 0de93de706..0de93de706 100644
--- a/test/911-get-stack-trace/src/ThreadListTraces.java
+++ b/test/911-get-stack-trace/src/art/ThreadListTraces.java
diff --git a/test/913-heaps/src/Main.java b/test/913-heaps/src/art/Test913.java
index c54ecb049f..c54ecb049f 100644
--- a/test/913-heaps/src/Main.java
+++ b/test/913-heaps/src/art/Test913.java
diff --git a/test/918-fields/src/Main.java b/test/918-fields/src/art/Test918.java
index 89d518c82d..89d518c82d 100644
--- a/test/918-fields/src/Main.java
+++ b/test/918-fields/src/art/Test918.java
diff --git a/test/920-objects/src/Main.java b/test/920-objects/src/art/Test920.java
index 708e417e6b..708e417e6b 100644
--- a/test/920-objects/src/Main.java
+++ b/test/920-objects/src/art/Test920.java
diff --git a/test/922-properties/src/Main.java b/test/922-properties/src/art/Test922.java
index 4b2204a86c..4b2204a86c 100644
--- a/test/922-properties/src/Main.java
+++ b/test/922-properties/src/art/Test922.java
diff --git a/test/923-monitors/src/Main.java b/test/923-monitors/src/art/Test923.java
index 02e86a6891..02e86a6891 100644
--- a/test/923-monitors/src/Main.java
+++ b/test/923-monitors/src/art/Test923.java
diff --git a/test/924-threads/src/Main.java b/test/924-threads/src/art/Test924.java
index 160bf8ea67..160bf8ea67 100644
--- a/test/924-threads/src/Main.java
+++ b/test/924-threads/src/art/Test924.java
diff --git a/test/925-threadgroups/src/Main.java b/test/925-threadgroups/src/art/Test925.java
index 14ca7a79d2..14ca7a79d2 100644
--- a/test/925-threadgroups/src/Main.java
+++ b/test/925-threadgroups/src/art/Test925.java
diff --git a/test/927-timers/src/Main.java b/test/927-timers/src/art/Test927.java
index 1ed016070b..1ed016070b 100644
--- a/test/927-timers/src/Main.java
+++ b/test/927-timers/src/art/Test927.java
diff --git a/test/928-jni-table/src/Main.java b/test/928-jni-table/src/art/Test928.java
index 3f3935d383..3f3935d383 100644
--- a/test/928-jni-table/src/Main.java
+++ b/test/928-jni-table/src/art/Test928.java
diff --git a/test/931-agent-thread/src/Main.java b/test/931-agent-thread/src/art/Test931.java
index bc096a770f..bc096a770f 100644
--- a/test/931-agent-thread/src/Main.java
+++ b/test/931-agent-thread/src/art/Test931.java
diff --git a/test/933-misc-events/src/Main.java b/test/933-misc-events/src/art/Test933.java
index afebbf8798..afebbf8798 100644
--- a/test/933-misc-events/src/Main.java
+++ b/test/933-misc-events/src/art/Test933.java
diff --git a/test/Android.run-test-jvmti-java-library.mk b/test/Android.run-test-jvmti-java-library.mk
new file mode 100644
index 0000000000..4a5b5c17c0
--- /dev/null
+++ b/test/Android.run-test-jvmti-java-library.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Main shim classes. We use one that exposes the tagging common functionality.
+LOCAL_SRC_FILES := \
+  903-hello-tagging/src/art/Main.java \
+
+# Actual test classes.
+LOCAL_SRC_FILES += \
+  901-hello-ti-agent/src/art/Test901.java \
+  903-hello-tagging/src/art/Test903.java \
+  904-object-allocation/src/art/Test904.java \
+  905-object-free/src/art/Test905.java \
+  906-iterate-heap/src/art/Test906.java \
+  907-get-loaded-classes/src/art/Test907.java \
+  908-gc-start-finish/src/art/Test908.java \
+  910-methods/src/art/Test910.java \
+  911-get-stack-trace/src/art/Test911.java \
+    911-get-stack-trace/src/art/AllTraces.java \
+    911-get-stack-trace/src/art/ControlData.java \
+    911-get-stack-trace/src/art/Frames.java \
+    911-get-stack-trace/src/art/OtherThread.java \
+    911-get-stack-trace/src/art/PrintThread.java \
+    911-get-stack-trace/src/art/Recurse.java \
+    911-get-stack-trace/src/art/SameThread.java \
+    911-get-stack-trace/src/art/ThreadListTraces.java \
+  913-heaps/src/art/Test913.java \
+  918-fields/src/art/Test918.java \
+  920-objects/src/art/Test920.java \
+  922-properties/src/art/Test922.java \
+  923-monitors/src/art/Test923.java \
+  924-threads/src/art/Test924.java \
+  925-threadgroups/src/art/Test925.java \
+  927-timers/src/art/Test927.java \
+  928-jni-table/src/art/Test928.java \
+  931-agent-thread/src/art/Test931.java \
+  933-misc-events/src/art/Test933.java \
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+LOCAL_MODULE := run-test-jvmti-java
+include $(BUILD_HOST_JAVA_LIBRARY)