| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 73c2a4461b33f77cf44c58132bf493612feb57a7..ab88e69c231f67e866a666b9ff1871d9a93f65b3 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,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.
|
| @@ -4216,8 +4219,6 @@
|
| 'ldflags': [
|
| '-nostdlib',
|
| '-Wl,--no-undefined',
|
| - # Don't export symbols from statically linked libraries.
|
| - '-Wl,--exclude-libs=ALL',
|
| ],
|
| 'libraries': [
|
| '-l<(android_stlport_library)',
|
| @@ -4228,8 +4229,8 @@
|
| '-lm',
|
| ],
|
| 'conditions': [
|
| - ['component=="shared_library"', {
|
| - 'ldflags!': [
|
| + ['component=="static_library"', {
|
| + 'ldflags': [
|
| '-Wl,--exclude-libs=ALL',
|
| ],
|
| }],
|
|
|