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

Side by Side Diff: ui/gfx/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
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 "win/dpi.h", 215 "win/dpi.h",
216 "win/hwnd_util.cc", 216 "win/hwnd_util.cc",
217 "win/hwnd_util.h", 217 "win/hwnd_util.h",
218 "win/scoped_set_map_mode.h", 218 "win/scoped_set_map_mode.h",
219 "win/singleton_hwnd.cc", 219 "win/singleton_hwnd.cc",
220 "win/singleton_hwnd.h", 220 "win/singleton_hwnd.h",
221 "win/window_impl.cc", 221 "win/window_impl.cc",
222 "win/window_impl.h", 222 "win/window_impl.h",
223 ] 223 ]
224 224
225 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
226 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
227
225 defines = [ "GFX_IMPLEMENTATION" ] 228 defines = [ "GFX_IMPLEMENTATION" ]
226 229
227 deps = [ 230 deps = [
228 ":gfx_export", 231 ":gfx_export",
229 "//base", 232 "//base",
230 "//base:i18n", 233 "//base:i18n",
231 "//base:base_static", 234 "//base:base_static",
232 "//base/third_party/dynamic_annotations", 235 "//base/third_party/dynamic_annotations",
233 "//skia", 236 "//skia",
234 "//third_party/harfbuzz-ng", 237 "//third_party/harfbuzz-ng",
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 "android", 301 "android",
299 "jnigraphics", 302 "jnigraphics",
300 ] 303 ]
301 } else { 304 } else {
302 sources -= [ "canvas_notimplemented.cc" ] 305 sources -= [ "canvas_notimplemented.cc" ]
303 } 306 }
304 307
305 # Windows. 308 # Windows.
306 if (is_win) { 309 if (is_win) {
307 cflags = [ 310 cflags = [
308 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
309 "/wd4324", # Structure was padded due to __declspec(align()), which is 311 "/wd4324", # Structure was padded due to __declspec(align()), which is
310 # uninteresting. 312 # uninteresting.
311 ] 313 ]
312 } else { 314 } else {
313 sources -= [ 315 sources -= [
314 "gdi_util.cc", 316 "gdi_util.cc",
315 "gdi_util.h", 317 "gdi_util.h",
316 "icon_util.cc", 318 "icon_util.cc",
317 "icon_util.h", 319 "icon_util.h",
318 ] 320 ]
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 "render_text_unittest.cc", 445 "render_text_unittest.cc",
444 "sequential_id_generator_unittest.cc", 446 "sequential_id_generator_unittest.cc",
445 "shadow_value_unittest.cc", 447 "shadow_value_unittest.cc",
446 "skbitmap_operations_unittest.cc", 448 "skbitmap_operations_unittest.cc",
447 "skrect_conversion_unittest.cc", 449 "skrect_conversion_unittest.cc",
448 "transform_util_unittest.cc", 450 "transform_util_unittest.cc",
449 "utf16_indexing_unittest.cc", 451 "utf16_indexing_unittest.cc",
450 ] 452 ]
451 } 453 }
452 454
455 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
456 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
457
453 deps = [ 458 deps = [
454 ":gfx", 459 ":gfx",
455 ":test_support", 460 ":test_support",
456 "//base", 461 "//base",
457 "//base/test:test_support", 462 "//base/test:test_support",
458 "//skia", 463 "//skia",
459 "//third_party/icu:icuuc", 464 "//third_party/icu:icuuc",
460 "//third_party/libpng", 465 "//third_party/libpng",
461 "//third_party/zlib", 466 "//third_party/zlib",
462 "//testing/gtest", 467 "//testing/gtest",
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 "/DELAYLOAD:d2d1.dll", 507 "/DELAYLOAD:d2d1.dll",
503 "/DELAYLOAD:d3d10_1.dll", 508 "/DELAYLOAD:d3d10_1.dll",
504 ] 509 ]
505 510
506 libs = [ 511 libs = [
507 "d2d1.lib", 512 "d2d1.lib",
508 "d3d10_1.lib", 513 "d3d10_1.lib",
509 "imm32.lib", 514 "imm32.lib",
510 "oleacc.lib", 515 "oleacc.lib",
511 ] 516 ]
512
513 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
514 cflags = [ "/wd4267" ]
515 } 517 }
516 } 518 }
517 519
518 if (is_android) { 520 if (is_android) {
519 generate_jni("gfx_jni_headers") { 521 generate_jni("gfx_jni_headers") {
520 sources = [ 522 sources = [
521 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 523 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
522 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 524 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
523 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 525 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
524 ] 526 ]
525 jni_package = "gfx" 527 jni_package = "gfx"
526 } 528 }
527 } 529 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698