Chromium Code Reviews| Index: build/android.gypi |
| =================================================================== |
| --- build/android.gypi (revision 12799) |
| +++ build/android.gypi (working copy) |
| @@ -122,8 +122,6 @@ |
| 'ldflags': [ |
| '-nostdlib', |
| '-Wl,--no-undefined', |
| - # Don't export symbols from statically linked libraries. |
| - '-Wl,--exclude-libs=ALL', |
| ], |
| 'libraries!': [ |
| '-lrt', # librt is built into Bionic. |
| @@ -219,8 +217,15 @@ |
| ['_type=="shared_library"', { |
| 'ldflags': [ |
| '-Wl,-shared,-Bsymbolic', |
| + '<(android_lib)/crtbegin_so.o', |
| ], |
| }], |
| + ['_type=="static_library"', { |
| + 'ldflags': [ |
| + # Don't export symbols from statically linked libraries. |
| + '-Wl,--exclude-libs=ALL', |
|
Jakob Kummerow
2012/10/24 08:41:44
nit: indentation (align with the line above please
|
| + ], |
| + }], |
| ], |
| }], # _toolset=="target" |
| # Settings for building host targets using the system toolchain. |