Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index b81acbe25aecc1db418a72e93bbbc55600b81629..83559deb87f4be3bfa0f4883f5df19a24d80e393 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -5073,7 +5073,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', |
| @@ -5135,16 +5134,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', |
|
Dirk Pranke
2015/12/11 23:20:06
GN will only support ninja, so maybe this flag isn
baxley
2015/12/12 00:33:21
Yeah, probably not. This isn't new code, it just g
|
| + ], |
| + }], |
| ], |
| }], |
| + ['OS=="mac"', { |
| + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden |
| + }], |
| ], |
| }, |
| 'conditions': [ |