diff options
| author | baxley <baxley@chromium.org> | 2015-12-18 08:25:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 16:26:40 +0000 |
| commit | b17fbf8f6b05bd868b1555bcbda50c9dfad1946f (patch) | |
| tree | c0fb88369566d3032b58c03ddd047bee991602e8 /build/common.gypi | |
| parent | 264567afb2a2b59a2f155d50463d94476cbef6bf (diff) | |
| download | chromium_src-b17fbf8f6b05bd868b1555bcbda50c9dfad1946f.zip chromium_src-b17fbf8f6b05bd868b1555bcbda50c9dfad1946f.tar.gz chromium_src-b17fbf8f6b05bd868b1555bcbda50c9dfad1946f.tar.bz2 | |
Don't set -fvisibility=hidden for iOS Debug in GYP.
Remove -fvisibility=hidden for Debug configuration on iOS at the
top level (common.gypi), so we don't remove symbols from
dependencies.
BUG=569073
Review URL: https://codereview.chromium.org/1533003002
Cr-Commit-Position: refs/heads/master@{#366106}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index d829ae4..a3e2bee 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5081,7 +5081,6 @@ # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'GCC_OBJC_CALL_CXX_CDTORS': 'YES', # -fobjc-call-cxx-cdtors - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', # -Werror 'GCC_VERSION': '4.2', @@ -5143,16 +5142,35 @@ '-fcolor-diagnostics', ], }], - ['OS=="ios" and target_subarch!="arm32" and \ - "<(GENERATOR)"=="xcode"', { - 'OTHER_CFLAGS': [ - # TODO(ios): when building Chrome for iOS on 64-bit platform - # with Xcode, the -Wshorted-64-to-32 warning is automatically - # enabled. This cause failures when compiling protobuf code, - # so disable the warning. http://crbug.com/359107 - '-Wno-shorten-64-to-32', + ['OS=="ios"', { + 'configurations': { + 'Debug': { + # XCTests inject a dynamic library into the application. If + # fvisibility is set to hidden, then some symbols needed by + # XCTests are not available. Disable this setting for + # Debug configuration. + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', + }, + 'Release': { + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden + }, + }, + 'conditions': [ + ['target_subarch!="arm32" and "<(GENERATOR)"=="xcode"', { + 'OTHER_CFLAGS': [ + # TODO(ios): when building Chrome for iOS on 64-bit + # platform with Xcode, the -Wshorted-64-to-32 warning is + # automatically enabled. This causes failures when + # compiling protobuf code, so disable the warning. + # http://crbug.com/359107 + '-Wno-shorten-64-to-32', + ], + }], ], }], + ['OS=="mac"', { + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden + }], ], }, 'conditions': [ |