diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 11:33:38 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 11:33:38 +0000 |
| commit | b4193654b32b8d35e8f77d1a57317db1ef489c88 (patch) | |
| tree | 9f35f414b4c8564301696bb26fa73a1e32c229ab /build/common.gypi | |
| parent | e78fc02f46d81ffef419abcbece034ff55871105 (diff) | |
| download | chromium_src-b4193654b32b8d35e8f77d1a57317db1ef489c88.zip chromium_src-b4193654b32b8d35e8f77d1a57317db1ef489c88.tar.gz chromium_src-b4193654b32b8d35e8f77d1a57317db1ef489c88.tar.bz2 | |
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
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 19 |
1 files changed, 8 insertions, 11 deletions
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 |