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', |
], |
}], |