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

Side by Side Diff: ash/BUILD.gn

Issue 929793006: Update existing uses of /wd4267 to use the GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x64
Patch Set: Created 5 years, 10 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 | « apps/BUILD.gn ('k') | base/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 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 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 "//url", 55 "//url",
56 ] 56 ]
57 57
58 if (is_win) { 58 if (is_win) {
59 sources -= [ 59 sources -= [
60 "sticky_keys/sticky_keys_controller.cc", 60 "sticky_keys/sticky_keys_controller.cc",
61 "sticky_keys/sticky_keys_controller.h", 61 "sticky_keys/sticky_keys_controller.h",
62 ] 62 ]
63 63
64 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 64 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
65 cflags = [ "/wd4267" ] 65 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
66 } 66 }
67 67
68 if (use_x11) { 68 if (use_x11) {
69 configs += [ 69 configs += [
70 "//build/config/linux:x11", 70 "//build/config/linux:x11",
71 "//build/config/linux:xfixes", 71 "//build/config/linux:xfixes",
72 ] 72 ]
73 deps += [ 73 deps += [
74 "//ui/events/platform", 74 "//ui/events/platform",
75 "//ui/gfx/x", 75 "//ui/gfx/x",
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 "sticky_keys/sticky_keys_overlay_unittest.cc", 307 "sticky_keys/sticky_keys_overlay_unittest.cc",
308 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", 308 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc",
309 "virtual_keyboard_controller_unittest.cc", 309 "virtual_keyboard_controller_unittest.cc",
310 "wm/workspace/workspace_window_resizer_unittest.cc", 310 "wm/workspace/workspace_window_resizer_unittest.cc",
311 ] 311 ]
312 sources += [ 312 sources += [
313 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO (GYP) 313 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO (GYP)
314 ] 314 ]
315 } 315 }
316 316
317 if (is_win) { 317 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
318 cflags = [ "/wd4267" ]
319 }
320 318
321 if (!use_x11) { 319 if (!use_x11) {
322 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] 320 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
323 } 321 }
324 if (is_chromeos) { 322 if (is_chromeos) {
325 sources += [ "first_run/first_run_helper_unittest.cc" ] 323 sources += [ "first_run/first_run_helper_unittest.cc" ]
326 deps += [ 324 deps += [
327 "//device/bluetooth", 325 "//device/bluetooth",
328 "//ui/display", 326 "//ui/display",
329 "//ui/display:test_util", 327 "//ui/display:test_util",
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 "//skia", 389 "//skia",
392 "//testing/gtest", 390 "//testing/gtest",
393 "//ui/accessibility", 391 "//ui/accessibility",
394 ] 392 ]
395 393
396 if (is_chromeos) { 394 if (is_chromeos) {
397 deps += [ "//ui/display" ] 395 deps += [ "//ui/display" ]
398 } 396 }
399 } 397 }
400 } 398 }
OLDNEW
« no previous file with comments | « apps/BUILD.gn ('k') | base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698