Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Unified Diff: build/common.gypi

Issue 147533004: Remove unneeded JNI registrations. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Updated by review comments. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0eaf2c7a6c253899b945dcbe4e5168ef83b3fcfb..6ad4519b42388186ab64ad030a8fecfad33372d4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1628,6 +1628,9 @@
# 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',
Torne 2014/04/22 10:53:21 You mustn't use absolute paths here; for the webvi
ostap 2014/04/24 03:58:43 Done.
}], # OS=="android"
['android_webview_build==1', {
# When building the WebView in the Android tree, jarjar will remap all
@@ -3977,6 +3980,12 @@
['_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)"',
+ ],
+ }],
# Settings for building device targets using Android's toolchain.
# These are based on the setup.mk file from the Android NDK.
@@ -4041,8 +4050,7 @@
'ldflags': [
'-nostdlib',
'-Wl,--no-undefined',
- # Don't export symbols from statically linked libraries.
- '-Wl,--exclude-libs=ALL',
+
],
'libraries': [
'-l<(android_stlport_library)',
@@ -4053,11 +4061,6 @@
'-lm',
],
'conditions': [
- ['component=="shared_library"', {
- 'ldflags!': [
- '-Wl,--exclude-libs=ALL',
- ],
- }],
['clang==1', {
'cflags': [
# Work around incompatibilities between bionic and clang

Powered by Google App Engine
This is Rietveld 408576698