ART: Rearrange some JVMTI headers
Move around pieces to prepare for multiple cc files.
Bug: 31455788
Test: m test-art-host
Change-Id: I4e2dfccbca3b51c72ad8b1f1857d8eebc1ec43a2
diff --git a/runtime/openjdkjvmti/OpenjdkJvmTi.cc b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
index 339c457..d3561c1 100644
--- a/runtime/openjdkjvmti/OpenjdkJvmTi.cc
+++ b/runtime/openjdkjvmti/OpenjdkJvmTi.cc
@@ -32,6 +32,7 @@
#include <jni.h>
#include "openjdkjvmti/jvmti.h"
+#include "art_jvmti.h"
#include "gc_root-inl.h"
#include "globals.h"
#include "jni_env_ext-inl.h"
@@ -44,25 +45,6 @@
namespace openjdkjvmti {
-extern const jvmtiInterface_1 gJvmtiInterface;
-
-// A structure that is a jvmtiEnv with additional information for the runtime.
-struct ArtJvmTiEnv : public jvmtiEnv {
- art::JavaVMExt* art_vm;
- void* local_data;
-
- explicit ArtJvmTiEnv(art::JavaVMExt* runtime) : art_vm(runtime), local_data(nullptr) {
- functions = &gJvmtiInterface;
- }
-};
-
-// Macro and constexpr to make error values less annoying to write.
-#define ERR(e) JVMTI_ERROR_ ## e
-static constexpr jvmtiError OK = JVMTI_ERROR_NONE;
-
-// Special error code for unimplemented functions in JVMTI
-static constexpr jvmtiError ERR(NOT_IMPLEMENTED) = JVMTI_ERROR_NOT_AVAILABLE;
-
class JvmtiFunctions {
private:
static bool IsValidEnv(jvmtiEnv* env) {