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

Side by Side Diff: ui/base/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 | « ui/aura/BUILD.gn ('k') | ui/base/ime/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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 sources += [ "touch/touch_device_win.cc" ] 287 sources += [ "touch/touch_device_win.cc" ]
288 } else if (is_android) { 288 } else if (is_android) {
289 sources += [ "touch/touch_device_android.cc" ] 289 sources += [ "touch/touch_device_android.cc" ]
290 } else if (is_linux) { 290 } else if (is_linux) {
291 sources += [ "touch/touch_device_linux.cc" ] 291 sources += [ "touch/touch_device_linux.cc" ]
292 } else { 292 } else {
293 # Empty implementation for all other cases. 293 # Empty implementation for all other cases.
294 sources += [ "touch/touch_device.cc" ] 294 sources += [ "touch/touch_device.cc" ]
295 } 295 }
296 296
297 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
298 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
299
297 defines = [ "UI_BASE_IMPLEMENTATION" ] 300 defines = [ "UI_BASE_IMPLEMENTATION" ]
298 301
299 public_deps = [ 302 public_deps = [
300 "//base", 303 "//base",
301 "//skia", 304 "//skia",
302 "//ui/events/platform", 305 "//ui/events/platform",
303 "//ui/events:events_base", 306 "//ui/events:events_base",
304 "//ui/gfx", 307 "//ui/gfx",
305 "//ui/gfx/geometry", 308 "//ui/gfx/geometry",
306 ] 309 ]
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 410 }
408 411
409 libs = [] 412 libs = []
410 if (is_win) { 413 if (is_win) {
411 sources += [ 414 sources += [
412 "cursor/cursor_loader_win.cc", 415 "cursor/cursor_loader_win.cc",
413 "cursor/cursor_loader_win.h", 416 "cursor/cursor_loader_win.h",
414 ] 417 ]
415 deps += [ "//third_party/wtl" ] 418 deps += [ "//third_party/wtl" ]
416 cflags = [ 419 cflags = [
417 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
418 "/wd4324", # Structure was padded due to __declspec(align()), which is 420 "/wd4324", # Structure was padded due to __declspec(align()), which is
419 # uninteresting. 421 # uninteresting.
420 ] 422 ]
421 ldflags = [ 423 ldflags = [
422 "/DELAYLOAD:d2d1.dll", 424 "/DELAYLOAD:d2d1.dll",
423 "/DELAYLOAD:d3d10_1.dll", 425 "/DELAYLOAD:d3d10_1.dll",
424 "/DELAYLOAD:dwmapi.dll", 426 "/DELAYLOAD:dwmapi.dll",
425 ] 427 ]
426 libs += [ 428 libs += [
427 "d2d1.lib", 429 "d2d1.lib",
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 } 696 }
695 if (!use_x11 && is_chromeos) { 697 if (!use_x11 && is_chromeos) {
696 # These were already removed in the non-chromeos case. 698 # These were already removed in the non-chromeos case.
697 sources -= [ 699 sources -= [
698 "ime/chromeos/character_composer_unittest.cc", 700 "ime/chromeos/character_composer_unittest.cc",
699 "ime/input_method_chromeos_unittest.cc", 701 "ime/input_method_chromeos_unittest.cc",
700 ] 702 ]
701 } 703 }
702 } 704 }
703 705
706 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
707 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
708
704 deps = [ 709 deps = [
705 "//base", 710 "//base",
706 "//base/allocator", 711 "//base/allocator",
707 "//base/test:test_support", 712 "//base/test:test_support",
708 "//net", 713 "//net",
709 "//skia", 714 "//skia",
710 "//testing/gmock", 715 "//testing/gmock",
711 "//testing/gtest", 716 "//testing/gtest",
712 "//third_party/icu", 717 "//third_party/icu",
713 "//ui/base", 718 "//ui/base",
(...skipping 25 matching lines...) Expand all
739 ldflags = [ 744 ldflags = [
740 "/DELAYLOAD:d2d1.dll", 745 "/DELAYLOAD:d2d1.dll",
741 "/DELAYLOAD:d3d10_1.dll", 746 "/DELAYLOAD:d3d10_1.dll",
742 ] 747 ]
743 libs = [ 748 libs = [
744 "d2d1.lib", 749 "d2d1.lib",
745 "d3d10_1.lib", 750 "d3d10_1.lib",
746 "imm32.lib", 751 "imm32.lib",
747 "oleacc.lib", 752 "oleacc.lib",
748 ] 753 ]
749
750 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
751 cflags = [ "/wd4267" ]
752 } 754 }
753 755
754 if (!is_win || !use_aura) { 756 if (!is_win || !use_aura) {
755 sources -= [ "view_prop_unittest.cc" ] 757 sources -= [ "view_prop_unittest.cc" ]
756 } 758 }
757 759
758 if (is_android) { 760 if (is_android) {
759 apk_deps = [ "//chrome:resources" ] 761 apk_deps = [ "//chrome:resources" ]
760 } 762 }
761 763
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 } 804 }
803 805
804 if (is_chromeos) { 806 if (is_chromeos) {
805 deps += [ 807 deps += [
806 "//chromeos", 808 "//chromeos",
807 "//ui/events:dom4_keycode_converter", 809 "//ui/events:dom4_keycode_converter",
808 ] 810 ]
809 } 811 }
810 } 812 }
811 # TODO(GYP) Mac (ui_base_tests_bundle) 813 # TODO(GYP) Mac (ui_base_tests_bundle)
OLDNEW
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/base/ime/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698