| Index: base/android/library_loader/library_loader_hooks.cc
|
| diff --git a/base/android/library_loader/library_loader_hooks.cc b/base/android/library_loader/library_loader_hooks.cc
|
| index 79470108eb33b58e6a06f1bab518e56ea6cc89b0..87f791090b0a4cb6607e8457e33adeab1e311aeb 100644
|
| --- a/base/android/library_loader/library_loader_hooks.cc
|
| +++ b/base/android/library_loader/library_loader_hooks.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/android/library_loader/library_loader_hooks.h"
|
|
|
| +#include "base/android/command_line_android.h"
|
| #include "base/android/jni_string.h"
|
| #include "base/at_exit.h"
|
| #include "base/metrics/histogram.h"
|
| @@ -24,12 +25,16 @@ void SetLibraryLoadedHook(LibraryLoadedHook* func) {
|
| g_registration_callback = func;
|
| }
|
|
|
| -static jboolean LibraryLoaded(JNIEnv* env, jclass clazz,
|
| - jobjectArray init_command_line) {
|
| +static void InitCommandLine(JNIEnv* env, jclass clazz,
|
| + jobjectArray init_command_line) {
|
| + InitNativeCommandLineFromJavaArray(env, init_command_line);
|
| +}
|
| +
|
| +static jboolean LibraryLoaded(JNIEnv* env, jclass clazz) {
|
| if(g_registration_callback == NULL) {
|
| return true;
|
| }
|
| - return g_registration_callback(env, clazz, init_command_line);
|
| + return g_registration_callback(env, clazz);
|
| }
|
|
|
| static void RecordChromiumAndroidLinkerHistogram(
|
|
|