From b4193654b32b8d35e8f77d1a57317db1ef489c88 Mon Sep 17 00:00:00 2001
From: "torne@chromium.org"
 <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 9 Jun 2014 11:33:38 +0000
Subject: Revert 275652 "Remove unneeded JNI registrations."

This has broken the Android WebView build by introducing an absolute
path into the generated makefiles, rendering them nonportable.

> Remove unneeded JNI registrations.
>
> Rather than registering all jni bindings at startup, only get references
> to the class object for those files which require bindings. All others
> are satisfied by exporting symbols which can be found automatically by
> dalvik.
>
> This patch replaces excldue-libs=ALL with ld version script to strip unwanted
> symbols: https://sourceware.org/binutils/docs-2.24/ld/VERSION.html#VERSION
>
> BUG=
>
> Review URL: https://codereview.chromium.org/147533004

TBR=sl.ostapenko@samsung.com

Review URL: https://codereview.chromium.org/326603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275796 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/common.gypi | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'build/common.gypi')

diff --git a/build/common.gypi b/build/common.gypi
index a1a9b79..73c2a44 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1731,9 +1731,6 @@
 
         # 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
@@ -4153,13 +4150,7 @@
         },
         '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.
@@ -4225,7 +4216,8 @@
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
-
+              # Don't export symbols from statically linked libraries.
+              '-Wl,--exclude-libs=ALL',
             ],
             'libraries': [
               '-l<(android_stlport_library)',
@@ -4236,6 +4228,11 @@
               '-lm',
             ],
             'conditions': [
+              ['component=="shared_library"', {
+                'ldflags!': [
+                  '-Wl,--exclude-libs=ALL',
+                ],
+              }],
               ['clang==1', {
                 'cflags': [
                   # Work around incompatibilities between bionic and clang
-- 
cgit v1.1