Separate OnJNIOnLoad

base/android/base_jni_onload.h

Index: base/android/base_jni_onload.h
diff --git a/base/android/base_jni_onload.h b/base/android/base_jni_onload.h
index f3f05fa54ffcb37d6af6e2a48d2b18469b37b94c..5c977c7f3f3f278a77396575cd66e568f23cfbb2 100644
--- a/base/android/base_jni_onload.h
+++ b/base/android/base_jni_onload.h
@@ -15,11 +15,17 @@ namespace android {
 
 class JNIOnLoadDelegate;
 
-// Returns whether JNI registration and initialization succeeded. Caller shall
-// put the JNIOnLoadDelegate into |delegates| in reverse order. Refer
+// Returns whether JNI registration succeeded. Caller shall put the
+// JNIOnLoadDelegate into |delegates| in reverse order. Refer
 // JNIOnLoadDelegate for more information.
-BASE_EXPORT bool OnJNIOnLoad(JavaVM* vm,
-                             std::vector<JNIOnLoadDelegate*>* delegates);
+BASE_EXPORT bool OnJNIOnLoadRegisterJNI(

[jam, 2015/02/19 22:17:55]

nit: the JNI suffix seems redundant

[michaelbai, 2015/02/20 00:58:35]

JNIOnLoad() is entry point of android shared library, I want keep the name to
indicate the methods are called in JNI_OnLoad()

+    JavaVM* vm,
+    std::vector<JNIOnLoadDelegate*>* delegates);
+
+// Returns whether initialization succeeded. Caller shall put the
+// JNIOnLoadDelegate into |delegates| in reverse order. Refer
+// JNIOnLoadDelegate for more information.
+BASE_EXPORT bool OnJNIOnLoadInit(std::vector<JNIOnLoadDelegate*>* delegates);

[jam, 2015/02/19 22:17:55]

now that there are two methods, it's a bit confusing that they each take an
interface that contains callbacks for the other methods. it would be clearer to
have each one take callbacks. i.e.

typedef base::Callback<bool(JNIEnv*)> RegisterCallback;
BASE_EXPORT bool OnJNIOnLoadRegister(
  JavaVM* vm,
  std::vector<RegisterCallback> callbacks);

typedef base::Callback<bool(void)> InitCallback;
BASE_EXPORT bool OnJNIOnLoadInit(std::vector<InitCallback> callbacks);

[michaelbai, 2015/02/20 00:58:35]

Done.

 
 }  // namespace android
 }  // namespace base