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

Unified Diff: build/common.gypi

Issue 147533004: Remove unneeded JNI registrations. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Use link_settings in JNI generator .gypis to provide linker exports list. Created 6 years, 6 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
« no previous file with comments | « build/android/android_exports.lst ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 73c2a4461b33f77cf44c58132bf493612feb57a7..d9f28b616dd9976ec969e16dee5df730d34ec7c9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1731,6 +1731,9 @@
# 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"
['android_webview_build==1', {
# When building the WebView in the Android tree, jarjar will remap all
@@ -4150,7 +4153,12 @@
},
'target_conditions': [
['_type=="shared_library"', {
- 'product_extension': '<(android_product_extension)',
+ 'product_extension': '<(android_product_extension)',
+ }],
+ ['_toolset=="target" and component=="static_library" and _type=="shared_library"', {
+ 'inputs': [
Torne 2014/06/11 10:29:47 Does this actually have any effect? I wouldn't exp
+ '<(android_linker_script)',
+ ],
}],
# Settings for building device targets using Android's toolchain.
@@ -4216,8 +4224,7 @@
'ldflags': [
'-nostdlib',
'-Wl,--no-undefined',
- # Don't export symbols from statically linked libraries.
- '-Wl,--exclude-libs=ALL',
Torne 2014/06/11 10:29:47 If we remove this, doesn't it mean that any target
+
],
'libraries': [
'-l<(android_stlport_library)',
@@ -4228,11 +4235,6 @@
'-lm',
],
'conditions': [
- ['component=="shared_library"', {
- 'ldflags!': [
- '-Wl,--exclude-libs=ALL',
- ],
- }],
['clang==1', {
'cflags': [
# Work around incompatibilities between bionic and clang
« no previous file with comments | « build/android/android_exports.lst ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698