Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: cloud_print/service/win/service.gyp

Issue 1216413002: Fix remaining warnings for -Wmissing-braces and enable on win clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Less nesting Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/installer/gcapi/gcapi.cc ('k') | components/policy/core/common/policy_loader_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'target_defaults': { 5 'target_defaults': {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'enable_wexit_time_destructors': 1, 8 'enable_wexit_time_destructors': 1,
9 }, 9 },
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 'conditions': [ 81 'conditions': [
82 ['clang==1', { 82 ['clang==1', {
83 # TODO: Remove once cloud_print_service_config.cc no longer depends 83 # TODO: Remove once cloud_print_service_config.cc no longer depends
84 # on atlapp.h, http://crbug.com/5027 84 # on atlapp.h, http://crbug.com/5027
85 'VCCLCompilerTool': { 85 'VCCLCompilerTool': {
86 'AdditionalOptions': [ 86 'AdditionalOptions': [
87 # atlapp.h contains a global "using namespace WTL;". 87 # atlapp.h contains a global "using namespace WTL;".
88 '-Wno-header-hygiene', 88 '-Wno-header-hygiene',
89 # atlgdi.h does an intentional assignment in an if conditional. 89 # atlgdi.h does an intentional assignment in an if conditional.
90 '-Wno-parentheses', 90 '-Wno-parentheses',
91 # atlgdi.h fails with -Wreorder enabled.
92 '-Wno-reorder',
93 # atlgdi.h doesn't use braces around subobject initializers.
94 '-Wno-missing-braces',
91 ], 95 ],
92 }, 96 },
93 }], 97 }],
94 ], 98 ],
95 }, 99 },
96 'variables': {
97 'clang_warning_flags': [
98 # atlgdi.h fails with -Wreorder enabled.
99 '-Wno-reorder',
100 ]
101 },
102 }, 100 },
103 { 101 {
104 'target_name': 'cloud_print_service_setup', 102 'target_name': 'cloud_print_service_setup',
105 'type': 'executable', 103 'type': 'executable',
106 'sources': [ 104 'sources': [
107 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve rsion.rc', 105 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve rsion.rc',
108 'installer.cc', 106 'installer.cc',
109 'installer.h', 107 'installer.h',
110 ], 108 ],
111 'includes': [ 109 'includes': [
112 'service_resources.gypi' 110 'service_resources.gypi'
113 ], 111 ],
114 'dependencies': [ 112 'dependencies': [
115 '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_reso urces', 113 '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_reso urces',
116 '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib', 114 '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
117 '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib', 115 '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib',
118 ], 116 ],
119 'msvs_settings': { 117 'msvs_settings': {
120 'VCLinkerTool': { 118 'VCLinkerTool': {
121 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 119 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
122 'UACExecutionLevel': '2', # /level='requireAdministrator' 120 'UACExecutionLevel': '2', # /level='requireAdministrator'
123 'AdditionalDependencies': [ 121 'AdditionalDependencies': [
124 'secur32.lib', 122 'secur32.lib',
125 ], 123 ],
126 }, 124 },
127 }, 125 },
128 }, 126 },
129 ], 127 ],
130 } 128 }
OLDNEW
« no previous file with comments | « chrome/installer/gcapi/gcapi.cc ('k') | components/policy/core/common/policy_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698