Separate JNI registration with initialization

chrome/chrome_shell.gypi

 # 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.
 
 # This GYPI allows independent customization of the chrome shell in a manner
 # similar to content shell (in content_shell.gypi). Notably, this file does
 # NOT contain chrome_android_core, which is independent of the chrome shell
 # and should be separately customized.
 {
   'variables': {
@@ skipping 30 matching lines @@
             # Chrome shell should always use the statically-linked CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
         }],
       ],
     },
     {
       # GN: //chrome/android:chrome_shell
       'target_name': 'libchromeshell',
       'type': 'shared_library',
       'sources': [
-        # This file must always be included in the shared_library step to ensure
-        # JNI_OnLoad is exported.
-        'app/android/chrome_jni_onload.cc',
         'android/shell/chrome_main_delegate_chrome_shell_android.cc',
         'android/shell/chrome_main_delegate_chrome_shell_android.h',
       ],
       'dependencies': [
         'libchromeshell_base',
       ],
       'includes': [
         # File 'protection' is based on non-trivial linker magic. TODO(pasko):
         # remove it when crbug.com/424562 is fixed.
         '../base/files/protect_file_posix.gypi',
       ],
     },
     {
       # GN: //chrome/android:chrome_sync_shell
       'target_name': 'libchromesyncshell',
       'type': 'shared_library',
       'sources': [
-        # This file must always be included in the shared_library step to ensure
-        # JNI_OnLoad is exported.
-        'app/android/chrome_jni_onload.cc',
         'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc',
         'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h',
       ],
       'dependencies': [
         'libchromeshell_base',
         '../sync/sync.gyp:test_support_sync_fake_server_android',
       ],
     },
     {
       # GN: //chrome/android:chrome_shell_manifest
@@ skipping 90 matching lines @@
       'target_name': 'chrome_sync_shell_apk_java',
       'type': 'none',
       'dependencies': [
         'chrome_sync_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
   ],
 
 }