Revert 275652 "Remove unneeded JNI registrations."

trunk/src/build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1713 matching lines @@
         # When building as part of the Android system, use system libraries
         # where possible to reduce ROM size.
         # TODO(steveblock): Investigate using the system version of sqlite.
         'use_system_sqlite%': 0,  # '<(android_webview_build)',
         'use_system_expat%': '<(android_webview_build)',
         'use_system_icu%': '<(android_webview_build)',
         'use_system_stlport%': '<(android_webview_build)',
 
         # Copy it out one scope.
         'android_webview_build%': '<(android_webview_build)',
-
-        # Default android linker script for shared library exports.
-        'android_linker_script%': '<!(cd <(DEPTH) && pwd -P)/build/android/android_exports.lst',
       }],  # OS=="android"
       ['android_webview_build==1', {
         # When building the WebView in the Android tree, jarjar will remap all
         # the class names, so the JNI generator needs to know this.
         'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt',
       }],
       ['OS=="mac"', {
         'conditions': [
           # All Chrome builds have breakpad symbols, but only process the
           # symbols from official builds.
@@ skipping 2399 matching lines @@
             # versions with the same name (e.g. skia, icu).
             ['component=="shared_library"', {
               'android_product_extension': 'cr.so',
             }, {
               'android_product_extension': 'so',
             } ],
           ],
         },
         'target_conditions': [
           ['_type=="shared_library"', {
-            'product_extension': '<(android_product_extension)',
-          }],
-          ['_toolset=="target" and component=="static_library" and _type=="shared_library"', {
-            'ldflags': [
-              # Only export symbols that are specified in version script.
-              '-Wl,--version-script=<(android_linker_script)',
-            ],
+           'product_extension': '<(android_product_extension)',
           }],
 
           # Settings for building device targets using Android's toolchain.
           # These are based on the setup.mk file from the Android NDK.
           #
           # The NDK Android executable link step looks as follows:
           #  $LDFLAGS
           #  $(TARGET_CRTBEGIN_DYNAMIC_O)  <-- crtbegin.o
           #  $(PRIVATE_OBJECTS)            <-- The .o that we built
           #  $(PRIVATE_STATIC_LIBRARIES)   <-- The .a that we built
@@ skipping 45 matching lines @@
               'USE_STLPORT=1',
               '_STLP_USE_PTR_SPECIALIZATIONS=1',
               'CHROME_BUILD_ID="<(chrome_build_id)"',
             ],
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
-
+              # Don't export symbols from statically linked libraries.
+              '-Wl,--exclude-libs=ALL',
             ],
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.
               '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
               '-lc',
               '-ldl',
               '-lm',
             ],
             'conditions': [
+              ['component=="shared_library"', {
+                'ldflags!': [
+                  '-Wl,--exclude-libs=ALL',
+                ],
+              }],
               ['clang==1', {
                 'cflags': [
                   # Work around incompatibilities between bionic and clang
                   # headers.
                   '-D__compiler_offsetof=__builtin_offsetof',
                   '-Dnan=__builtin_nan',
                 ],
                 'conditions': [
                   ['target_arch=="arm"', {
                     'cflags': [
@@ skipping 1183 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }