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

Side by Side Diff: third_party/cld_2/BUILD.gn

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 | « remoting/remoting_host_win.gypi ('k') | third_party/cld_2/cld_2.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 6
7 gypi_values = exec_script("//build/gypi_to_gn.py", 7 gypi_values = exec_script("//build/gypi_to_gn.py",
8 [ rebase_path("cld_2.gyp") ], 8 [ rebase_path("cld_2.gyp") ],
9 "scope", 9 "scope",
10 [ "cld_2.gyp" ]) 10 [ "cld_2.gyp" ])
(...skipping 28 matching lines...) Expand all
39 sources += gypi_values.cld2_data_smallest_sources 39 sources += gypi_values.cld2_data_smallest_sources
40 } else if (cld2_table_size == 2) { 40 } else if (cld2_table_size == 2) {
41 sources += gypi_values.cld2_data_largest_sources 41 sources += gypi_values.cld2_data_largest_sources
42 } 42 }
43 43
44 include_dirs = [ 44 include_dirs = [
45 "src/internal", 45 "src/internal",
46 "src/public", 46 "src/public",
47 ] 47 ]
48 48
49 config("cld2_data_warnings") {
50 if (is_clang) {
51 # The generated files don't have braces around subobject initializers.
52 cflags = [ "-Wno-missing-braces" ]
53 }
54 }
49 configs -= [ "//build/config/compiler:chromium_code" ] 55 configs -= [ "//build/config/compiler:chromium_code" ]
50 configs += [ "//build/config/compiler:no_chromium_code" ] 56 configs += [ "//build/config/compiler:no_chromium_code" ]
57 configs += [ ":cld2_data_warnings" ]
51 } 58 }
52 59
53 # As in the corresponding gyp file, this just builds the core interfaces for 60 # As in the corresponding gyp file, this just builds the core interfaces for
54 # CLD2. You must still declare a dependency on a specific data set, either 61 # CLD2. You must still declare a dependency on a specific data set, either
55 # cld2_dynamic or cld2_static. 62 # cld2_dynamic or cld2_static.
56 source_set("cld_2") { 63 source_set("cld_2") {
57 sources = gypi_values.cld2_core_sources 64 sources = gypi_values.cld2_core_sources
58 include_dirs = [ 65 include_dirs = [
59 "src/internal", 66 "src/internal",
60 "src/public", 67 "src/public",
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 ":cld2_dynamic", 133 ":cld2_dynamic",
127 ] 134 ]
128 135
129 configs -= [ "//build/config/compiler:chromium_code" ] 136 configs -= [ "//build/config/compiler:chromium_code" ]
130 configs += [ 137 configs += [
131 ":cld2_dynamic_mode_config", 138 ":cld2_dynamic_mode_config",
132 "//build/config/compiler:no_chromium_code", 139 "//build/config/compiler:no_chromium_code",
133 ] 140 ]
134 } 141 }
135 } 142 }
OLDNEW
« no previous file with comments | « remoting/remoting_host_win.gypi ('k') | third_party/cld_2/cld_2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698