diff options
| author | baxley <baxley@chromium.org> | 2015-12-18 08:48:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 16:49:08 +0000 |
| commit | 4f8c7cc523c6d1453531b7f0e16cc66c1c4a84fa (patch) | |
| tree | 33d05f507beb003c4a1e186ddffffc83b926678c /build | |
| parent | b17fbf8f6b05bd868b1555bcbda50c9dfad1946f (diff) | |
| download | chromium_src-4f8c7cc523c6d1453531b7f0e16cc66c1c4a84fa.zip chromium_src-4f8c7cc523c6d1453531b7f0e16cc66c1c4a84fa.tar.gz chromium_src-4f8c7cc523c6d1453531b7f0e16cc66c1c4a84fa.tar.bz2 | |
Revert of Don't set -fvisibility=hidden for iOS Debug in GYP. (patchset #1 id:1 of https://codereview.chromium.org/1533003002/ )
Reason for revert:
fails compile on xcodebuild + device
Original issue's description:
> 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
>
> Committed: https://crrev.com/b17fbf8f6b05bd868b1555bcbda50c9dfad1946f
> Cr-Commit-Position: refs/heads/master@{#366106}
TBR=dpranke@google.com,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=569073
Review URL: https://codereview.chromium.org/1538573005
Cr-Commit-Position: refs/heads/master@{#366107}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/build/common.gypi b/build/common.gypi index a3e2bee..d829ae4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5081,6 +5081,7 @@ # 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', @@ -5142,35 +5143,16 @@ '-fcolor-diagnostics', ], }], - ['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=="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=="mac"', { - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden - }], ], }, 'conditions': [ |