Cleanup of redefinition testing
Move redefine logic into a single common function and perform some
other cleanup.
Test: mma -j40 test-art-host
Change-Id: I8618bda4f392b683ce198374066e356b87578e7b
diff --git a/test/ti-agent/common_helper.h b/test/ti-agent/common_helper.h
index 84997f3..76543fe 100644
--- a/test/ti-agent/common_helper.h
+++ b/test/ti-agent/common_helper.h
@@ -18,9 +18,19 @@
#define ART_TEST_TI_AGENT_COMMON_HELPER_H_
#include "jni.h"
+#include "openjdkjvmti/jvmti.h"
#include "ScopedLocalRef.h"
namespace art {
+namespace common_redefine {
+
+jint OnLoad(JavaVM* vm, char* options, void* reserved);
+
+} // namespace common_redefine
+
+extern bool RuntimeIsJVM;
+
+bool IsJVM();
template <typename T>
static jobjectArray CreateObjectArray(JNIEnv* env,
@@ -53,11 +63,7 @@
return ret.release();
}
-static void SetAllCapabilities(jvmtiEnv* env) {
- jvmtiCapabilities caps;
- env->GetPotentialCapabilities(&caps);
- env->AddCapabilities(&caps);
-}
+void SetAllCapabilities(jvmtiEnv* env);
} // namespace art