diff options
| author | mstrum <mstrum@amazon.com> | 2015-01-14 10:24:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 18:25:07 +0000 |
| commit | 8c70705f1cb3d9726c3ba8f782209173193f8d3e (patch) | |
| tree | 7fd1d339d14b28489812023172efb9fe4fee97fa | |
| parent | 3e53fe55d93d5557ffd6c99b2d1c3ea34dbbaad8 (diff) | |
| download | chromium_src-8c70705f1cb3d9726c3ba8f782209173193f8d3e.zip chromium_src-8c70705f1cb3d9726c3ba8f782209173193f8d3e.tar.gz chromium_src-8c70705f1cb3d9726c3ba8f782209173193f8d3e.tar.bz2 | |
Remove redundant OS checks in chrome_shell.gypi
chrome_shell.gypi is only included if OS=="android" so there is no reason
to test it again.
BUG=none
Review URL: https://codereview.chromium.org/810193006
Cr-Commit-Position: refs/heads/master@{#311517}
| -rw-r--r-- | chrome/android/BUILD.gn | 4 | ||||
| -rw-r--r-- | chrome/chrome_shell.gypi | 22 |
2 files changed, 8 insertions, 18 deletions
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 0e2865f..2ae0a73 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -188,12 +188,8 @@ static_library("chrome_shell_base") { # TODO(GYP): #[ 'order_profiling!=0', { - #'conditions': [ - #[ 'OS=="android"', { #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], #}], - #], - #}], } # GYP: //chrome/chrome_shell.gypi:libchromeshell diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi index 83bbb95..dd7c110 100644 --- a/chrome/chrome_shell.gypi +++ b/chrome/chrome_shell.gypi @@ -28,13 +28,16 @@ 'include_dirs': [ '../skia/config', ], + 'direct_dependent_settings': { + 'ldflags': [ + # Some android targets still depend on --gc-sections to link. + # TODO: remove --gc-sections for Debug builds (crbug.com/159847). + '-Wl,--gc-sections', + ], + }, 'conditions': [ [ 'order_profiling!=0', { - 'conditions': [ - [ 'OS=="android"', { - 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], - }], - ], + 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], }], [ 'use_allocator!="none"', { 'dependencies': [ @@ -45,15 +48,6 @@ # Chrome shell should always use the statically-linked CLD data. '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ], }], - ['OS=="android"', { - 'direct_dependent_settings': { - 'ldflags': [ - # Some android targets still depend on --gc-sections to link. - # TODO: remove --gc-sections for Debug builds (crbug.com/159847). - '-Wl,--gc-sections', - ], - }, - }], ], }, { |