Throw exception when initialization failed.

content/app/android/library_loader_hooks.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.
 
 #include "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/app/android/app_jni_registrar.h"
 #include "content/browser/android/browser_jni_registrar.h"
 #include "content/common/android/common_jni_registrar.h"
 #include "content/common/android/command_line.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/result_codes.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
 #include "jni/LibraryLoader_jni.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
 }
 
 namespace content {
 
-static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
+static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
                                           jobjectArray init_command_line) {

[joth, 2013/01/08 21:20:45]

indent wrong.

   InitNativeCommandLineFromJavaArray(env, init_command_line);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
     base::debug::TraceLog::GetInstance()->SetEnabled(
         command_line->GetSwitchValueASCII(switches::kTraceStartup));
   }
 
   // Can only use event tracing after setting up the command line.
   TRACE_EVENT0("jni", "JNI_OnLoad continuation");
 
   logging::InitLogging(NULL,
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
                        logging::DONT_LOCK_LOG_FILE,
                        logging::DELETE_OLD_LOG_FILE,
                        logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(false,    // Process ID
                        false,    // Thread ID
                        false,    // Timestamp
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   if (!base::android::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!net::android::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!ui::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterCommonJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterBrowserJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterAppJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!media::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!gfx::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;

[joth, 2013/01/08 21:20:45]

I don't think it's adding much to reuse result_codes.h for these. It seems the
other result codes would be impossible to return here, and conversely the
FAILED_TO_REGSITER_JNI is android only cannot happen subsequent to this point.

just returning a boolean and then on the java side include a message in the
exception (need a new c'tor overload) "JNI registration error" seems as good. we
can define exception.getErrorCode() == -1 to mean other or some such thing

[michaelbai, 2013/01/09 00:14:00]

I think it is better for user to find the error in one place. If we are
concerned about the change here, I can revert this file and add a native method
like
 int nativeGetFailedToRegisterJNIResultCode(). 
and add it in Java side. Sounds better?


On 2013/01/08 21:20:45, joth wrote:

 
-  return JNI_TRUE;
+  return 0;
 }
 
 void LibraryLoaderExitHook() {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;
     g_at_exit_manager = NULL;
   }
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // We need the AtExitManager to be created at the very beginning.
   g_at_exit_manager = new base::AtExitManager();
 
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content