Move all tools/ agents into tools/jvmti-agents directory

This organizes all the various jvmti agents we have into a single,
easy-to-search place.

Test: build
Change-Id: I92aeaf92e70bedabc38000bb14d4aac17a929793

28 files changed, 18 insertions, 3 deletions

diff --git a/tools/jvmti-agents/README.md b/tools/jvmti-agents/README.md
new file mode 100644
index 0000000000..6f3e6dc5d3
--- /dev/null
+++ b/tools/jvmti-agents/README.md
@@ -0,0 +1,15 @@
+# JVMTI Agents
+
+This is the collection of various jvmti agents that we have created for debugging or testing the
+runtime. Most of these work on both the RI and ART, on both host and device.
+
+## Agents
+
+* [libbreakpointlogger](./breakpoint-logger)
+* [libdumpjvmti](./dump-jvmti-state)
+* [libfieldnull](./field-null-percent)
+* [libjitload](./jit-load)
+* [libforceredefine](./simple-force-redefine)
+* [litifast](./ti-fast)
+* [libtitrace](./titrace)
+* [libwrapagentproperties](./wrapagentproperties)
\ No newline at end of file
diff --git a/tools/breakpoint-logger/Android.bp b/tools/jvmti-agents/breakpoint-logger/Android.bp
index 67b423abf1..67b423abf1 100644
--- a/tools/breakpoint-logger/Android.bp
+++ b/tools/jvmti-agents/breakpoint-logger/Android.bp
diff --git a/tools/breakpoint-logger/README.md b/tools/jvmti-agents/breakpoint-logger/README.md
index d7ffb3440f..d7ffb3440f 100644
--- a/tools/breakpoint-logger/README.md
+++ b/tools/jvmti-agents/breakpoint-logger/README.md
diff --git a/tools/breakpoint-logger/breakpoint_logger.cc b/tools/jvmti-agents/breakpoint-logger/breakpoint_logger.cc
index 2f8b68239b..2f8b68239b 100644
--- a/tools/breakpoint-logger/breakpoint_logger.cc
+++ b/tools/jvmti-agents/breakpoint-logger/breakpoint_logger.cc
diff --git a/tools/dump-jvmti-state/Android.bp b/tools/jvmti-agents/dump-jvmti-state/Android.bp
index 5c78965b40..5c78965b40 100644
--- a/tools/dump-jvmti-state/Android.bp
+++ b/tools/jvmti-agents/dump-jvmti-state/Android.bp
diff --git a/tools/dump-jvmti-state/README.md b/tools/jvmti-agents/dump-jvmti-state/README.md
index 4aabc082ac..4aabc082ac 100644
--- a/tools/dump-jvmti-state/README.md
+++ b/tools/jvmti-agents/dump-jvmti-state/README.md
diff --git a/tools/dump-jvmti-state/dump-jvmti.cc b/tools/jvmti-agents/dump-jvmti-state/dump-jvmti.cc
index 71a0115999..71a0115999 100644
--- a/tools/dump-jvmti-state/dump-jvmti.cc
+++ b/tools/jvmti-agents/dump-jvmti-state/dump-jvmti.cc
diff --git a/tools/field-null-percent/Android.bp b/tools/jvmti-agents/field-null-percent/Android.bp
index 26bb1dc437..26bb1dc437 100644
--- a/tools/field-null-percent/Android.bp
+++ b/tools/jvmti-agents/field-null-percent/Android.bp
diff --git a/tools/field-null-percent/README.md b/tools/jvmti-agents/field-null-percent/README.md
index d8bc65d9cc..d8bc65d9cc 100644
--- a/tools/field-null-percent/README.md
+++ b/tools/jvmti-agents/field-null-percent/README.md
diff --git a/tools/field-null-percent/check-null-fields.py b/tools/jvmti-agents/field-null-percent/check-null-fields.py
index c11d51a1b0..c11d51a1b0 100755
--- a/tools/field-null-percent/check-null-fields.py
+++ b/tools/jvmti-agents/field-null-percent/check-null-fields.py
diff --git a/tools/field-null-percent/fieldnull.cc b/tools/jvmti-agents/field-null-percent/fieldnull.cc
index 8f5b389a48..8f5b389a48 100644
--- a/tools/field-null-percent/fieldnull.cc
+++ b/tools/jvmti-agents/field-null-percent/fieldnull.cc
diff --git a/tools/jit-load/Android.bp b/tools/jvmti-agents/jit-load/Android.bp
index a57a4088ec..a57a4088ec 100644
--- a/tools/jit-load/Android.bp
+++ b/tools/jvmti-agents/jit-load/Android.bp
diff --git a/tools/jit-load/README.md b/tools/jvmti-agents/jit-load/README.md
index 8aa4513c06..8aa4513c06 100644
--- a/tools/jit-load/README.md
+++ b/tools/jvmti-agents/jit-load/README.md
diff --git a/tools/jit-load/jitload.cc b/tools/jvmti-agents/jit-load/jitload.cc
index 7e715de2cc..7e715de2cc 100644
--- a/tools/jit-load/jitload.cc
+++ b/tools/jvmti-agents/jit-load/jitload.cc
diff --git a/tools/simple-force-redefine/Android.bp b/tools/jvmti-agents/simple-force-redefine/Android.bp
index 871f210ac9..871f210ac9 100644
--- a/tools/simple-force-redefine/Android.bp
+++ b/tools/jvmti-agents/simple-force-redefine/Android.bp
diff --git a/tools/simple-force-redefine/README.md b/tools/jvmti-agents/simple-force-redefine/README.md
index 362c7044c2..362c7044c2 100644
--- a/tools/simple-force-redefine/README.md
+++ b/tools/jvmti-agents/simple-force-redefine/README.md
diff --git a/tools/simple-force-redefine/forceredefine.cc b/tools/jvmti-agents/simple-force-redefine/forceredefine.cc
index 91702c2c49..91702c2c49 100644
--- a/tools/simple-force-redefine/forceredefine.cc
+++ b/tools/jvmti-agents/simple-force-redefine/forceredefine.cc
diff --git a/tools/ti-fast/Android.bp b/tools/jvmti-agents/ti-fast/Android.bp
index fd867c9bcc..fd867c9bcc 100644
--- a/tools/ti-fast/Android.bp
+++ b/tools/jvmti-agents/ti-fast/Android.bp
diff --git a/tools/ti-fast/README.md b/tools/jvmti-agents/ti-fast/README.md
index c8cf180fc2..c8cf180fc2 100644
--- a/tools/ti-fast/README.md
+++ b/tools/jvmti-agents/ti-fast/README.md
diff --git a/tools/ti-fast/tifast.cc b/tools/jvmti-agents/ti-fast/tifast.cc
index 677823a41e..677823a41e 100644
--- a/tools/ti-fast/tifast.cc
+++ b/tools/jvmti-agents/ti-fast/tifast.cc
diff --git a/tools/titrace/Android.bp b/tools/jvmti-agents/titrace/Android.bp
index 21f266c087..21f266c087 100644
--- a/tools/titrace/Android.bp
+++ b/tools/jvmti-agents/titrace/Android.bp
diff --git a/tools/titrace/README.md b/tools/jvmti-agents/titrace/README.md
index a82025be8b..a82025be8b 100644
--- a/tools/titrace/README.md
+++ b/tools/jvmti-agents/titrace/README.md
diff --git a/tools/titrace/instruction_decoder.cc b/tools/jvmti-agents/titrace/instruction_decoder.cc
index 6f497b3c04..6f497b3c04 100644
--- a/tools/titrace/instruction_decoder.cc
+++ b/tools/jvmti-agents/titrace/instruction_decoder.cc
diff --git a/tools/titrace/instruction_decoder.h b/tools/jvmti-agents/titrace/instruction_decoder.h
index 34be2e903d..5ead8c5a11 100644
--- a/tools/titrace/instruction_decoder.h
+++ b/tools/jvmti-agents/titrace/instruction_decoder.h
@@ -14,8 +14,8 @@
 //
 
 
-#ifndef ART_TOOLS_TITRACE_INSTRUCTION_DECODER_H_
-#define ART_TOOLS_TITRACE_INSTRUCTION_DECODER_H_
+#ifndef ART_TOOLS_JVMTI_AGENTS_TITRACE_INSTRUCTION_DECODER_H_
+#define ART_TOOLS_JVMTI_AGENTS_TITRACE_INSTRUCTION_DECODER_H_
 
 #include <stddef.h>
 
@@ -39,4 +39,4 @@ class InstructionDecoder {
 
 }  // namespace titrace
 
-#endif  // ART_TOOLS_TITRACE_INSTRUCTION_DECODER_H_
+#endif  // ART_TOOLS_JVMTI_AGENTS_TITRACE_INSTRUCTION_DECODER_H_
diff --git a/tools/titrace/titrace.cc b/tools/jvmti-agents/titrace/titrace.cc
index 1e49c0b021..1e49c0b021 100644
--- a/tools/titrace/titrace.cc
+++ b/tools/jvmti-agents/titrace/titrace.cc
diff --git a/tools/wrapagentproperties/Android.bp b/tools/jvmti-agents/wrapagentproperties/Android.bp
index 8dec847c9e..8dec847c9e 100644
--- a/tools/wrapagentproperties/Android.bp
+++ b/tools/jvmti-agents/wrapagentproperties/Android.bp
diff --git a/tools/wrapagentproperties/README.md b/tools/jvmti-agents/wrapagentproperties/README.md
index d968087cf8..d968087cf8 100644
--- a/tools/wrapagentproperties/README.md
+++ b/tools/jvmti-agents/wrapagentproperties/README.md
diff --git a/tools/wrapagentproperties/wrapagentproperties.cc b/tools/jvmti-agents/wrapagentproperties/wrapagentproperties.cc
index 39cb20acf2..39cb20acf2 100644
--- a/tools/wrapagentproperties/wrapagentproperties.cc
+++ b/tools/jvmti-agents/wrapagentproperties/wrapagentproperties.cc