diff options
| author | Nico Weber <thakis@chromium.org> | 2014-09-04 21:43:03 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-09-05 04:47:02 +0000 |
| commit | 54d38dc5ade53006ab29f635cdacfb56620b9f69 (patch) | |
| tree | 5718e0a610b831d2a803d8a55d401ec1111cca66 /cloud_print | |
| parent | 22796d8d5fd362111b7aa431d229aa2ffc91aedd (diff) | |
| download | chromium_src-54d38dc5ade53006ab29f635cdacfb56620b9f69.zip chromium_src-54d38dc5ade53006ab29f635cdacfb56620b9f69.tar.gz chromium_src-54d38dc5ade53006ab29f635cdacfb56620b9f69.tar.bz2 | |
Fix problems in r293393.
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/542973002
Cr-Commit-Position: refs/heads/master@{#293440}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/service/service.gyp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp index 482bc19..afc1e8f 100644 --- a/cloud_print/service/service.gyp +++ b/cloud_print/service/service.gyp @@ -121,16 +121,6 @@ 'secur32.lib', ], }, - 'conditions': [ - ['clang==1', { - # atlapp.h contains a global "using namespace WTL;". - # TODO: Remove once cloud_print_service.cc no longer depends on - # atlapp.h, http://crbug.com/5027 - 'VCCLCompilerTool': { - 'AdditionalOptions': ['-Wno-header-hygiene'], - }, - }], - ], }, }, { @@ -160,6 +150,16 @@ 'secur32.lib', ], }, + 'conditions': [ + ['clang==1', { + # atlapp.h contains a global "using namespace WTL;". + # TODO: Remove once cloud_print_service_config.cc no longer depends + # on atlapp.h, http://crbug.com/5027 + 'VCCLCompilerTool': { + 'AdditionalOptions': ['-Wno-header-hygiene'], + }, + }], + ], }, }, { |