| OLD | NEW | 
|---|
| 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 import("//third_party/WebKit/Source/build/scripts/scripts.gni") | 7 import("//third_party/WebKit/Source/build/scripts/scripts.gni") | 
| 8 import("//third_party/WebKit/Source/config.gni") | 8 import("//third_party/WebKit/Source/config.gni") | 
| 9 import("//third_party/WebKit/Source/platform/platform.gni") | 9 import("//third_party/WebKit/Source/platform/platform.gni") | 
| 10 import("//third_party/WebKit/Source/platform/platform_generated.gni") | 10 import("//third_party/WebKit/Source/platform/platform_generated.gni") | 
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 197     "//third_party/iccjpeg", | 197     "//third_party/iccjpeg", | 
| 198     "//third_party/libpng", | 198     "//third_party/libpng", | 
| 199     "//third_party/libwebp", | 199     "//third_party/libwebp", | 
| 200     "//third_party/ots", | 200     "//third_party/ots", | 
| 201     "//third_party/qcms", | 201     "//third_party/qcms", | 
| 202     "//url", | 202     "//url", | 
| 203     "//v8", | 203     "//v8", | 
| 204   ] | 204   ] | 
| 205   deps = [ | 205   deps = [ | 
| 206     ":make_platform_generated", | 206     ":make_platform_generated", | 
|  | 207     "//device/battery:mojo_bindings", | 
| 207     "//third_party/WebKit/Source/platform/heap", | 208     "//third_party/WebKit/Source/platform/heap", | 
| 208     "//third_party/harfbuzz-ng", | 209     "//third_party/harfbuzz-ng", | 
| 209     "//third_party/icu", | 210     "//third_party/icu", | 
|  | 211     "//third_party/mojo/src/mojo/edk/system", | 
| 210     "//ui/gfx", | 212     "//ui/gfx", | 
| 211     "//ui/gfx/geometry", | 213     "//ui/gfx/geometry", | 
| 212   ] | 214   ] | 
| 213 | 215 | 
| 214   if (is_mac) { | 216   if (is_mac) { | 
| 215     sources -= [ | 217     sources -= [ | 
| 216       # Uses KillRingMac.mm instead. | 218       # Uses KillRingMac.mm instead. | 
| 217       "KillRingNone.cpp", | 219       "KillRingNone.cpp", | 
| 218       "fonts/skia/FontCacheSkia.cpp", | 220       "fonts/skia/FontCacheSkia.cpp", | 
| 219       "scroll/ScrollAnimator.cpp", | 221       "scroll/ScrollAnimator.cpp", | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 310   visibility += [ "//third_party/WebKit/*" ] | 312   visibility += [ "//third_party/WebKit/*" ] | 
| 311 | 313 | 
| 312   configs += [ | 314   configs += [ | 
| 313     "//third_party/WebKit/Source:config", | 315     "//third_party/WebKit/Source:config", | 
| 314     "//third_party/WebKit/Source:inside_blink", | 316     "//third_party/WebKit/Source:inside_blink", | 
| 315     "//third_party/WebKit/Source:non_test_config", | 317     "//third_party/WebKit/Source:non_test_config", | 
| 316   ] | 318   ] | 
| 317 | 319 | 
| 318   deps = [ | 320   deps = [ | 
| 319     ":platform", | 321     ":platform", | 
|  | 322     "//device/battery", | 
|  | 323     "//device/battery:mojo_bindings", | 
|  | 324     "//third_party/mojo/src/mojo/edk/system", | 
| 320   ] | 325   ] | 
| 321 | 326 | 
|  | 327   if (is_android) { | 
|  | 328     deps -= [ "//device/battery" ] | 
|  | 329   } | 
|  | 330 | 
| 322   if (is_win) { | 331   if (is_win) { | 
| 323     cflags = [ "/wd4267" ]  # Truncation from size_t to int. | 332     cflags = [ "/wd4267" ]  # Truncation from size_t to int. | 
| 324   } | 333   } | 
| 325 } | 334 } | 
| 326 | 335 | 
| 327 # TODO(GYP): Delete this after we've converted everything to GN. | 336 # TODO(GYP): Delete this after we've converted everything to GN. | 
| 328 # The _run targets exist only for compatibility w/ GYP. | 337 # The _run targets exist only for compatibility w/ GYP. | 
| 329 group("blink_heap_unittests_run") { | 338 group("blink_heap_unittests_run") { | 
| 330   testonly = true | 339   testonly = true | 
| 331   deps = [ | 340   deps = [ | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 409     "//base", | 418     "//base", | 
| 410     "//base/allocator", | 419     "//base/allocator", | 
| 411     "//base/test:test_support", | 420     "//base/test:test_support", | 
| 412     "//cc/blink", | 421     "//cc/blink", | 
| 413     "//skia", | 422     "//skia", | 
| 414     "//testing/gmock", | 423     "//testing/gmock", | 
| 415     "//testing/gtest", | 424     "//testing/gtest", | 
| 416     "//third_party/WebKit/Source/wtf", | 425     "//third_party/WebKit/Source/wtf", | 
| 417     "//third_party/WebKit/Source/wtf:test_support", | 426     "//third_party/WebKit/Source/wtf:test_support", | 
| 418     "//third_party/harfbuzz-ng", | 427     "//third_party/harfbuzz-ng", | 
|  | 428     "//third_party/mojo/src/mojo/edk/system", | 
|  | 429     "//third_party/mojo/src/mojo/edk/test:test_support", | 
| 419     "//url", | 430     "//url", | 
| 420   ] | 431   ] | 
| 421 | 432 | 
| 422   defines = [ "INSIDE_BLINK" ] | 433   defines = [ "INSIDE_BLINK" ] | 
| 423 | 434 | 
| 424   include_dirs = [ "$root_gen_dir/blink" ] | 435   include_dirs = [ "$root_gen_dir/blink" ] | 
| 425 } | 436 } | 
| 426 | 437 | 
| 427 if (current_cpu == "arm") { | 438 if (current_cpu == "arm") { | 
| 428   source_set("blink_arm_neon") { | 439   source_set("blink_arm_neon") { | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 446 } | 457 } | 
| 447 | 458 | 
| 448 if (current_cpu == "x86" || current_cpu == "x64") { | 459 if (current_cpu == "x86" || current_cpu == "x64") { | 
| 449   source_set("blink_x86_sse") { | 460   source_set("blink_x86_sse") { | 
| 450     sources = blink_platform_sse_files | 461     sources = blink_platform_sse_files | 
| 451     deps = [ | 462     deps = [ | 
| 452       ":blink_common", | 463       ":blink_common", | 
| 453     ] | 464     ] | 
| 454   } | 465   } | 
| 455 } | 466 } | 
| OLD | NEW | 
|---|