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

Side by Side Diff: third_party/cld_2/cld_2.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 | « third_party/cld_2/BUILD.gn ('k') | third_party/iaccessible2/BUILD.gn » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # MAINTAINERS: 5 # MAINTAINERS:
6 # See the BUILD.gn file for more extensive comments and documentation. This 6 # See the BUILD.gn file for more extensive comments and documentation. This
7 # .gyp file exists only for compatibility with gyp. The variables defined below 7 # .gyp file exists only for compatibility with gyp. The variables defined below
8 # are used in equivalent targets in BUILD.GN. 8 # are used in equivalent targets in BUILD.GN.
9 9
10 { 10 {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 'msvs_disabled_warnings': [4267], # size_t -> int conversion. 117 'msvs_disabled_warnings': [4267], # size_t -> int conversion.
118 }], 118 }],
119 ['cld2_table_size==0', { 119 ['cld2_table_size==0', {
120 'sources+': ['<@(cld2_data_smallest_sources)'] 120 'sources+': ['<@(cld2_data_smallest_sources)']
121 }], 121 }],
122 ['cld2_table_size==2', { 122 ['cld2_table_size==2', {
123 'sources+': ['<@(cld2_data_largest_sources)'] 123 'sources+': ['<@(cld2_data_largest_sources)']
124 }], 124 }],
125 ], 125 ],
126 'defines': ['CLD2_DYNAMIC_MODE'], 126 'defines': ['CLD2_DYNAMIC_MODE'],
127 'variables': {
128 'clang_warning_flags': [
129 # The generated files don't have braces around subobject initializers.
130 '-Wno-missing-braces',
131 ],
132 },
127 }, 133 },
128 134
129 { 135 {
130 # GN version: //third_party/cld_2 136 # GN version: //third_party/cld_2
131 'target_name': 'cld_2', 137 'target_name': 'cld_2',
132 'type': 'none', 138 'type': 'none',
133 'sources': ['<@(cld2_core_sources)'], 139 'sources': ['<@(cld2_core_sources)'],
134 'dependencies': [], 140 'dependencies': [],
135 }, 141 },
136 142
(...skipping 24 matching lines...) Expand all
161 ['OS=="win"', { 167 ['OS=="win"', {
162 'msvs_disabled_warnings': [4267], # size_t -> int conversion. 168 'msvs_disabled_warnings': [4267], # size_t -> int conversion.
163 }], 169 }],
164 ['cld2_table_size==0', { 170 ['cld2_table_size==0', {
165 'sources+': ['<@(cld2_data_smallest_sources)'] 171 'sources+': ['<@(cld2_data_smallest_sources)']
166 }], 172 }],
167 ['cld2_table_size==2', { 173 ['cld2_table_size==2', {
168 'sources+': ['<@(cld2_data_largest_sources)'] 174 'sources+': ['<@(cld2_data_largest_sources)']
169 }], 175 }],
170 ], 176 ],
177 'variables': {
178 'clang_warning_flags': [
179 # The generated files don't have braces around subobject initializers.
180 '-Wno-missing-braces',
181 ],
182 },
171 }, 183 },
172 184
173 { 185 {
174 # GN version: //third_party/cld_2:cld2_dynamic 186 # GN version: //third_party/cld_2:cld2_dynamic
175 'target_name': 'cld2_dynamic', 187 'target_name': 'cld2_dynamic',
176 'type': 'static_library', 188 'type': 'static_library',
177 'conditions': [ 189 'conditions': [
178 ['OS=="win"', { 190 ['OS=="win"', {
179 'msvs_disabled_warnings': [4267], # size_t -> int conversion. 191 'msvs_disabled_warnings': [4267], # size_t -> int conversion.
180 }], 192 }],
181 ], 193 ],
182 'include_dirs': [ 194 'include_dirs': [
183 'src/internal', 195 'src/internal',
184 'src/public', 196 'src/public',
185 ], 197 ],
186 'sources': [ 198 'sources': [
187 '<@(cld2_core_sources)', 199 '<@(cld2_core_sources)',
188 '<@(cld2_core_impl_sources)', 200 '<@(cld2_core_impl_sources)',
189 '<@(cld2_dynamic_data_loader_sources)', 201 '<@(cld2_dynamic_data_loader_sources)',
190 ], 202 ],
191 'defines': ['CLD2_DYNAMIC_MODE'], 203 'defines': ['CLD2_DYNAMIC_MODE'],
192 }, 204 },
193 ], 205 ],
194 } 206 }
OLDNEW
« no previous file with comments | « third_party/cld_2/BUILD.gn ('k') | third_party/iaccessible2/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698