Chromium Code Reviews| 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("//third_party/WebKit/Source/build/scripts/scripts.gni") | 6 import("//third_party/WebKit/Source/build/scripts/scripts.gni") |
| 7 import("//third_party/WebKit/Source/config.gni") | 7 import("//third_party/WebKit/Source/config.gni") |
| 8 | 8 |
| 9 platform_gypi = exec_script( | 9 platform_gypi = exec_script( |
| 10 "//build/gypi_to_gn.py", | 10 "//build/gypi_to_gn.py", |
| 11 [ rebase_path("blink_platform.gypi") ], | 11 [ rebase_path("blink_platform.gypi") ], |
| 12 "scope", | 12 "scope", |
| 13 [ "blink_platform.gypi" ]) | 13 [ "blink_platform.gypi" ]) |
| 14 heap_gypi = exec_script( | |
| 15 "//build/gypi_to_gn.py", | |
| 16 [ rebase_path("heap/blink_heap.gypi") ], | |
| 17 "scope", | |
| 18 [ "blink_heap.gypi" ]) | |
|
brettw
2014/06/04 05:01:15
This should match the other one (so "heap/blink_he
jamesr
2014/06/04 05:27:00
oooh, that's what that line does. fixed
| |
| 14 blink_platform_neon_files = [ | 19 blink_platform_neon_files = [ |
| 15 "graphics/cpu/arm/WebGLImageConversionNEON.h", | 20 "graphics/cpu/arm/WebGLImageConversionNEON.h", |
| 16 "graphics/cpu/arm/filters/FEBlendNEON.h", | 21 "graphics/cpu/arm/filters/FEBlendNEON.h", |
| 17 "graphics/cpu/arm/filters/FECompositeArithmeticNEON.h", | 22 "graphics/cpu/arm/filters/FECompositeArithmeticNEON.h", |
| 18 "graphics/cpu/arm/filters/FEGaussianBlurNEON.h", | 23 "graphics/cpu/arm/filters/FEGaussianBlurNEON.h", |
| 19 "graphics/cpu/arm/filters/FELightingNEON.h", | 24 "graphics/cpu/arm/filters/FELightingNEON.h", |
| 20 "graphics/cpu/arm/filters/NEONHelpers.h", | 25 "graphics/cpu/arm/filters/NEONHelpers.h", |
| 21 ] | 26 ] |
| 22 | 27 |
| 23 # blink_common in blink_platform.gyp | 28 # blink_common in blink_platform.gyp |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 325 # TODO(GYP) | 330 # TODO(GYP) |
| 326 #deps += [ "//third_party/ffmpeg" ] | 331 #deps += [ "//third_party/ffmpeg" ] |
| 327 } | 332 } |
| 328 if (use_openmax_dl_fft) { | 333 if (use_openmax_dl_fft) { |
| 329 include_dirs += [ "//third_party/openmax_dl" ] | 334 include_dirs += [ "//third_party/openmax_dl" ] |
| 330 # TODO(GYP) | 335 # TODO(GYP) |
| 331 # deps += [ "//third_party/openmax_dl/dl" ] | 336 # deps += [ "//third_party/openmax_dl/dl" ] |
| 332 } | 337 } |
| 333 } | 338 } |
| 334 | 339 |
| 340 source_set("heap_run_all_tests") { | |
| 341 sources = [ | |
| 342 "heap/RunAllTests.cpp" | |
| 343 ] | |
| 344 | |
| 345 configs += [ | |
| 346 "//third_party/WebKit/Source/wtf:wtf_config", | |
| 347 "//third_party/WebKit/Source:config", | |
| 348 "//third_party/WebKit/Source:non_test_config", | |
| 349 ] | |
| 350 | |
| 351 deps = [ | |
| 352 "//base/test:test_support", | |
| 353 "//testing/gmock", | |
| 354 "//testing/gtest", | |
| 355 "//third_party/WebKit/Source/wtf", | |
| 356 ] | |
| 357 } | |
| 358 | |
| 359 test("heap_unittests") { | |
| 360 output_name = "blink_heap_unittests" | |
| 361 | |
| 362 sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap") | |
| 363 | |
| 364 configs += [ | |
| 365 "//third_party/WebKit/Source:config", | |
| 366 ] | |
| 367 | |
| 368 deps = [ | |
| 369 ":platform", | |
| 370 ":heap_run_all_tests", | |
| 371 "//third_party/WebKit/Source/wtf", | |
|
brettw
2014/06/04 05:01:15
Can you alphabetize these (colon ones at the top).
jamesr
2014/06/04 05:27:00
Done.
| |
| 372 "//third_party/WebKit/Source/wtf:unittest_helpers", | |
| 373 "//base", | |
| 374 "//base/allocator", | |
| 375 "//testing/gmock", | |
| 376 "//testing/gtest", | |
| 377 ] | |
| 378 } | |
| 379 | |
| 380 source_set("platform_run_all_tests") { | |
| 381 sources = [ | |
| 382 "testing/RunAllTests.cpp" | |
| 383 ] | |
| 384 | |
| 385 configs += [ | |
| 386 "//third_party/WebKit/Source/wtf:wtf_config", | |
| 387 "//third_party/WebKit/Source:config", | |
| 388 "//third_party/WebKit/Source:non_test_config", | |
| 389 ] | |
| 390 | |
| 391 deps = [ | |
| 392 "//base/test:test_support", | |
| 393 "//testing/gmock", | |
| 394 "//testing/gtest", | |
| 395 "//third_party/WebKit/Source/wtf", | |
| 396 ] | |
| 397 } | |
| 398 | |
| 399 test("platform_unittests") { | |
| 400 output_name = "blink_platform_unittests" | |
| 401 | |
| 402 sources = platform_gypi.platform_test_files | |
| 403 | |
| 404 configs += [ | |
| 405 "//third_party/WebKit/Source:config", | |
| 406 ] | |
| 407 | |
| 408 deps = [ | |
| 409 "//base", | |
| 410 "//base/allocator", | |
| 411 "//skia", | |
| 412 "//testing/gmock", | |
| 413 "//testing/gtest", | |
| 414 "//third_party/WebKit/Source/wtf", | |
| 415 "//third_party/WebKit/Source/wtf:unittest_helpers", | |
| 416 "//url", | |
| 417 ":blink_common", | |
|
brettw
2014/06/04 05:01:15
Can you put the colon ones at the top?
jamesr
2014/06/04 05:27:00
Done.
| |
| 418 ":heap_run_all_tests", | |
| 419 ":platform", | |
| 420 ] | |
| 421 | |
| 422 defines = [ | |
| 423 "INSIDE_BLINK", | |
| 424 ] | |
| 425 | |
| 426 include_dirs = [ | |
| 427 "$root_gen_dir/blink", | |
| 428 ] | |
| 429 } | |
| 430 | |
| 431 | |
| 335 if (cpu_arch == "arm") { | 432 if (cpu_arch == "arm") { |
| 336 source_set("blink_arm_neon") { | 433 source_set("blink_arm_neon") { |
| 337 sources = blink_platform_neon_files | 434 sources = blink_platform_neon_files |
| 338 | 435 |
| 339 # The *NEON.cpp files fail to compile when -mthumb is passed. Force | 436 # The *NEON.cpp files fail to compile when -mthumb is passed. Force |
| 340 # them to build in ARM mode. | 437 # them to build in ARM mode. |
| 341 # See https://bugs.webkit.org/show_bug.cgi?id=62916. | 438 # See https://bugs.webkit.org/show_bug.cgi?id=62916. |
| 342 # TODO(GYP) | 439 # TODO(GYP) |
| 343 #'cflags': ['-marm'], | 440 #'cflags': ['-marm'], |
| 344 # 'conditions': [ | 441 # 'conditions': [ |
| 345 # ['OS=="android"', { | 442 # ['OS=="android"', { |
| 346 # 'cflags!': ['-mthumb'], | 443 # 'cflags!': ['-mthumb'], |
| 347 # }], | 444 # }], |
| 348 # ], | 445 # ], |
| 349 | 446 |
| 350 deps = [ ":blink_common" ] | 447 deps = [ ":blink_common" ] |
| 351 } | 448 } |
| 352 } | 449 } |
| 353 | 450 |
| 354 # This config is a placeholder to set up the V8 include path while the V8 GN | 451 # This config is a placeholder to set up the V8 include path while the V8 GN |
| 355 # build is being worked on. | 452 # build is being worked on. |
| 356 config("v8_stub_config") { | 453 config("v8_stub_config") { |
| 357 include_dirs = [ "//v8/include" ] | 454 include_dirs = [ "//v8/include" ] |
| 358 } | 455 } |
| OLD | NEW |