Separate JNI registration with initialization

chrome/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 169 matching lines @@
   # TODO(GYP):
   #[ 'order_profiling!=0', {
   #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
   #}],
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromeshell
 shared_library("chrome_shell") {
   testonly = true
   sources = [
-    # This file must always be included in the shared_library step to ensure
-    # JNI_OnLoad is exported.
-    "//chrome/app/android/chrome_jni_onload.cc",
     "shell/chrome_main_delegate_chrome_shell_android.cc",
     "shell/chrome_main_delegate_chrome_shell_android.h",
   ]
   deps = [
     ":chrome_shell_base",
   ]
 
   # GYP: via base/files/protect_file_posix.gypi
   # TODO(pasko): Remove this non-trivial linker wrapping as soon as
   # crbug.com/424562 is fixed.
   if (!is_component_build) {
     ldflags = [ "-Wl,--wrap=close" ]
     deps += [ "//base:protect_file_posix" ]
   }
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell
 shared_library("chrome_sync_shell") {
   testonly = true
   sources = [
-    # This file must always be included in the shared_library step to ensure
-    # JNI_OnLoad is exported.
-    #"//chrome/app/android/chrome_jni_onload.cc",
     #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc",
     #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h",
   ]
   deps = [
     "//sync:test_support_sync_fake_server_android",
   ]
   datadeps = [
     ":chrome_shell_base",
   ]
 }
@@ skipping 274 matching lines @@
   ]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }