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

Unified Diff: build/common.gypi

Issue 454923002: Don't register JNI methods for the android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 79d3f986192bbaf837dd0ca5cf28c76735f82604..9d22e23d489ce05b3104349464d96786e480ae34 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1780,6 +1780,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"
['embedded==1', {
'use_system_fontconfig%': 0,
@@ -4350,7 +4353,7 @@
},
'target_conditions': [
['_type=="shared_library"', {
- 'product_extension': '<(android_product_extension)',
+ 'product_extension': '<(android_product_extension)',
}],
# Settings for building device targets using Android's toolchain.
@@ -4416,8 +4419,6 @@
'ldflags': [
'-nostdlib',
'-Wl,--no-undefined',
- # Don't export symbols from statically linked libraries.
- '-Wl,--exclude-libs=ALL',
],
'libraries': [
'-l<(android_stlport_library)',
@@ -4428,8 +4429,8 @@
'-lm',
],
'conditions': [
- ['component=="shared_library"', {
- 'ldflags!': [
+ ['component=="static_library"', {
+ 'ldflags': [
'-Wl,--exclude-libs=ALL',
],
}],
« 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