Separate JNI registration with initialization

testing/android/native_test_launcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class sets up the environment for running the native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
@@ skipping 42 matching lines @@
 
 struct sigaction g_old_sa[NSIG];
 
 // This function runs in a compromised context. It should not allocate memory.
 void SignalHandler(int sig, siginfo_t* info, void* reserved) {
   // Output the crash marker.
   write(STDOUT_FILENO, kCrashedMarker, sizeof(kCrashedMarker));
   g_old_sa[sig].sa_sigaction(sig, info, reserved);
 }
 
-// TODO(nileshagrawal): now that we're using FIFO, test scripts can detect EOF.
-// Remove the signal handlers.
-void InstallHandlers() {
-  struct sigaction sa;
-  memset(&sa, 0, sizeof(sa));
-
-  sa.sa_sigaction = SignalHandler;
-  sa.sa_flags = SA_SIGINFO;
-
-  for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
-    sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
-  }
-}
-
 // Writes printf() style string to Android's logger where |priority| is one of
 // the levels defined in <android/log.h>.
 void AndroidLog(int priority, const char* format, ...) {
   va_list args;
   va_start(args, format);
   __android_log_vprint(priority, kLogTag, format, args);
   va_end(args);
 }
 
 }  // namespace
 
 static void RunTests(JNIEnv* env,
                      jobject obj,
                      jstring jcommand_line_flags,
                      jstring jcommand_line_file_path,
                      jstring jstdout_file_path,
                      jboolean jstdout_fifo,
                      jobject app_context) {
-  base::AtExitManager exit_manager;
-
   // Command line initialized basically, will be fully initialized later.
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
   base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   // Set the application context in base.
   base::android::ScopedJavaLocalRef<jobject> scoped_context(
       env, env->NewLocalRef(app_context));
   base::android::InitApplicationContext(env, scoped_context);
   base::android::RegisterJni(env);
 
@@ skipping 43 matching lines @@
     AndroidLog(ANDROID_LOG_VERBOSE,
                "Native test waiting for GDB because flag %s was supplied",
                switches::kWaitForDebugger);
     base::debug::WaitForDebugger(24 * 60 * 60, false);
   }
 
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
 
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  // Install signal handlers to detect crashes.
-  InstallHandlers();
+bool RegisterNativeTestJNI(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
 
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
-  if (!RegisterNativesImpl(env)) {
-    return -1;
+
+// TODO(nileshagrawal): now that we're using FIFO, test scripts can detect EOF.
+// Remove the signal handlers.
+void InstallHandlers() {
+  struct sigaction sa;
+  memset(&sa, 0, sizeof(sa));
+
+  sa.sa_sigaction = SignalHandler;
+  sa.sa_flags = SA_SIGINFO;
+
+  for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
+    sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
   }
-
-  return JNI_VERSION_1_4;
 }