commit 645ed336e9504c6bb47d86091ffdc0c78986aa1c
author Alex Light <allight@google.com> Thu Apr 20 17:05:06 2017 -0700
committer Alex Light <allight@google.com> Mon Apr 24 15:47:18 2017 +0000
tree 28658d3b074adfc85234df5844864e38493915f1
parent 916e7b9151158318d1938d6dd00bf871c1f9a85a

Remove unneeded shims and JNI binding code for jvmti tests

Bug: 37522517
Test: cts-tradefed run cts-dev --module CtsJvmtiRunTest902HostTestCases
Test: cts-tradefed run cts-dev --module CtsJvmtiRunTest981HostTestCases
Test: cts-tradefed run cts-dev --module CtsJvmtiRedefineClassesHostTestCases
Change-Id: I138bc9912676ebffe95ba08067616afb7a49b191

hostsidetests/jvmti/base/jni/cts_agent.cpp

diff --git a/hostsidetests/jvmti/base/jni/cts_agent.cpp b/hostsidetests/jvmti/base/jni/cts_agent.cpp
index 6afae53..bb1e620 100644
--- a/hostsidetests/jvmti/base/jni/cts_agent.cpp
+++ b/hostsidetests/jvmti/base/jni/cts_agent.cpp
@@ -17,7 +17,6 @@
 #include <jni.h>
 #include <jvmti.h>
 
-#include "agent_startup.h"
 #include "android-base/logging.h"
 #include "jni_binder.h"
 #include "jvmti_helper.h"
@@ -43,15 +42,9 @@
 static constexpr const char* kMainClass = "art/CtsMain";
 static constexpr const char* kMainClassStartup = "startup";
 
-static void CtsStartCallback(jvmtiEnv* jenv, JNIEnv* env) {
-  InformMainAttach(jenv, env, kMainClass, kMainClassStartup);
-}
-
 extern "C" JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM* vm,
                                                char* options ATTRIBUTE_UNUSED,
                                                void* reserved ATTRIBUTE_UNUSED) {
-  BindOnLoad(vm, nullptr);
-
   if (vm->GetEnv(reinterpret_cast<void**>(&jvmti_env), JVMTI_VERSION_1_0) != 0) {
     LOG(FATAL) << "Could not get shared jvmtiEnv";
   }
@@ -63,13 +56,16 @@
 extern "C" JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM* vm,
                                                  char* options ATTRIBUTE_UNUSED,
                                                  void* reserved ATTRIBUTE_UNUSED) {
-  BindOnAttach(vm, CtsStartCallback);
+  JNIEnv* env;
+  CHECK_EQ(0, vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6))
+      << "Could not get JNIEnv";
 
   if (vm->GetEnv(reinterpret_cast<void**>(&jvmti_env), JVMTI_VERSION_1_0) != 0) {
     LOG(FATAL) << "Could not get shared jvmtiEnv";
   }
 
   SetAllCapabilities(jvmti_env);
+  InformMainAttach(jvmti_env, env, kMainClass, kMainClassStartup);
   return 0;
 }