diff --git a/android/android_exports.gyp b/android/android_exports.gyp
index c259eee37..bf3424d73 100644
--- a/android/android_exports.gyp
+++ b/android/android_exports.gyp
@@ -2,13 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# This target is only used when android_webview_build==1 - it implements a
+# whitelist for exported symbols to minimise the binary size and prevent us
+# accidentally exposing things we don't mean to expose.
+
 {
+  'variables': {
+    'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_webview_export_whitelist.lst',
+  },
   'targets': [
     {
       'target_name': 'android_exports',
       'type': 'none',
       'inputs': [
-        '<(DEPTH)/build/android/android_exports.lst',
+        '<(DEPTH)/build/android/android_webview_export_whitelist.lst',
       ],
       'outputs': [
         '<(android_linker_script)',
@@ -28,9 +35,6 @@
               # Only export symbols that are specified in version script.
               '-Wl,--version-script=<(android_linker_script)',
             ],
-            'ldflags!': [
-              '-Wl,--exclude-libs=ALL',
-            ],
           },
         }],
       ],
diff --git a/android/android_no_jni_exports.lst b/android/android_no_jni_exports.lst
new file mode 100644
index 000000000..ffc6cf702
--- /dev/null
+++ b/android/android_no_jni_exports.lst
@@ -0,0 +1,17 @@
+# 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 script makes all JNI exported symbols local, to prevent the JVM from
+# being able to find them, enforcing use of manual JNI function registration.
+# This is used for all Android binaries by default, unless they explicitly state
+# that they want JNI exported symbols to remain visible, as we need to ensure
+# the manual registration path is correct to maintain compatibility with the
+# crazy linker.
+# Check ld version script manual:
+# https://sourceware.org/binutils/docs-2.24/ld/VERSION.html#VERSION
+
+{
+  local:
+    Java_*;
+};
diff --git a/android/android_exports.lst b/android/android_webview_export_whitelist.lst
similarity index 72%
rename from android/android_exports.lst
rename to android/android_webview_export_whitelist.lst
index 6eee232f9..2a56a75b0 100644
--- a/android/android_exports.lst
+++ b/android/android_webview_export_whitelist.lst
@@ -2,7 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Default exports specification for chromium shared libraries on android.
+# Exports specification for android_webview_build==1, which uses a whitelist to
+# enforce only specific symbols being exported.
 # Check ld version script manual:
 # https://sourceware.org/binutils/docs-2.24/ld/VERSION.html#VERSION
 
diff --git a/common.gypi b/common.gypi
index 93da26f23..f8181b0cf 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1802,9 +1802,6 @@
 
         # Copy it out one scope.
         'android_webview_build%': '<(android_webview_build)',
-
-        # Default android linker script for shared library exports.
-        'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.lst',
       }],  # OS=="android"
       ['embedded==1', {
         'use_system_fontconfig%': 0,
@@ -2463,6 +2460,14 @@
         '-Wno-unnamed-type-template-args',
       ],
 
+      # By default, Android targets have their exported JNI symbols stripped,
+      # so we test the manual JNI registration code paths that are required
+      # when using the crazy linker. To allow use of native JNI exports (lazily
+      # resolved by the JVM), targets can enable this variable, which will stop
+      # the stripping from happening. Only targets which do not need to be
+      # compatible with the crazy linker are permitted to set this.
+      'use_native_jni_exports%': 0,
+
       'conditions': [
         ['OS=="win" and component=="shared_library"', {
           # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
@@ -4582,10 +4587,19 @@
               '-Wl,--no-undefined',
             ],
             'conditions': [
-              ['component=="static_library"', {
+              ['component=="static_library" and android_webview_build==0', {
                 'ldflags': [
                   '-Wl,--exclude-libs=ALL',
                 ],
+                'target_conditions': [
+                  ['use_native_jni_exports==0', {
+                    # Use a linker version script to strip JNI exports from
+                    # binaries which have not specifically asked to use them.
+                    'ldflags': [
+                      '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/build/android/android_no_jni_exports.lst',
+                    ],
+                  }],
+                ],
               }],
               ['clang==1', {
                 'cflags': [
diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index d806a1763..890304857 100644
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -441,6 +441,11 @@ if (is_win) {
   _shared_library_configs += _windows_linker_configs
 } else if (is_mac) {
   _shared_library_configs += [ "//build/config/mac:mac_dynamic_flags" ]
+} else if (is_android) {
+  # Strip native JNI exports from shared libraries by default. Binaries that
+  # want this can remove this config.
+  _shared_library_configs +=
+      [ "//build/config/android:hide_native_jni_exports" ]
 }
 set_defaults("shared_library") {
   configs = _shared_library_configs
diff --git a/config/android/BUILD.gn b/config/android/BUILD.gn
index 0cc38b7e3..5492693f5 100644
--- a/config/android/BUILD.gn
+++ b/config/android/BUILD.gn
@@ -25,3 +25,8 @@ config("executable_config") {
   cflags = [ "-fPIE" ]
   ldflags = [ "-pie" ]
 }
+
+config("hide_native_jni_exports") {
+  ldflags = [ "-Wl,--version-script=" +
+              rebase_path("//build/android/android_no_jni_exports.lst") ]
+}