Chromium Code Reviews| Index: Source/platform/BUILD.gn |
| diff --git a/Source/platform/BUILD.gn b/Source/platform/BUILD.gn |
| index a91da2ea2f3a13687536cc07d6129f0305aa9bed..25742a4c614958aa1137f2381546bbebfa5c16af 100644 |
| --- a/Source/platform/BUILD.gn |
| +++ b/Source/platform/BUILD.gn |
| @@ -11,11 +11,14 @@ import("//third_party/WebKit/Source/platform/platform_generated.gni") |
| # Most targets in this file are private actions so use that as the default. |
| visibility = [ ":*" ] |
| -heap_gypi = exec_script( |
| - "//build/gypi_to_gn.py", |
| - [ rebase_path("heap/blink_heap.gypi") ], |
| - "scope", |
| - [ "heap/blink_heap.gypi" ]) |
| +if (!is_mac) { |
| + # TODO(GYP): can't link Blink binaries yet. |
|
brettw
2014/11/12 05:25:37
Can you append "on mac" to these comments?
Dirk Pranke
2014/11/12 16:01:16
Sure.
|
| + heap_gypi = exec_script( |
| + "//build/gypi_to_gn.py", |
| + [ rebase_path("heap/blink_heap.gypi") ], |
| + "scope", |
| + [ "heap/blink_heap.gypi" ]) |
| +} |
| blink_platform_neon_files = [ |
| "graphics/cpu/arm/WebGLImageConversionNEON.h", |
| @@ -311,67 +314,70 @@ component("platform") { |
| } |
| } |
| -test("heap_unittests") { |
| - visibility = [] # Allow re-assignment of list. |
| - visibility = [ "//third_party/WebKit/*" ] |
| - output_name = "blink_heap_unittests" |
| +if (!is_mac) { |
| + # TODO(GYP): Can't link Blink binaries yet. |
| + test("heap_unittests") { |
| + visibility = [] # Allow re-assignment of list. |
| + visibility = [ "//third_party/WebKit/*" ] |
| + output_name = "blink_heap_unittests" |
| - sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap") |
| - sources += [ "heap/RunAllTests.cpp" ] |
| + sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap") |
| + sources += [ "heap/RunAllTests.cpp" ] |
| - configs += [ |
| - "//third_party/WebKit/Source/wtf:wtf_config", |
| - "//third_party/WebKit/Source:config", |
| - ] |
| + configs += [ |
| + "//third_party/WebKit/Source/wtf:wtf_config", |
| + "//third_party/WebKit/Source:config", |
| + ] |
| - deps = [ |
| - ":platform", |
| - "//base", |
| - "//base/allocator", |
| - "//base/test:test_support", |
| - "//testing/gmock", |
| - "//testing/gtest", |
| - "//third_party/WebKit/Source/wtf", |
| - "//third_party/WebKit/Source/wtf:test_support", |
| - "//content/test:test_support", |
| - ] |
| -} |
| + deps = [ |
| + ":platform", |
| + "//base", |
| + "//base/allocator", |
| + "//base/test:test_support", |
| + "//testing/gmock", |
| + "//testing/gtest", |
| + "//third_party/WebKit/Source/wtf", |
| + "//third_party/WebKit/Source/wtf:test_support", |
| + "//content/test:test_support", |
| + ] |
| + } |
| -test("platform_unittests") { |
| - visibility = [] # Allow re-assignment of list. |
| - visibility = [ "//third_party/WebKit/*" ] |
| - output_name = "blink_platform_unittests" |
| + test("platform_unittests") { |
| + visibility = [] # Allow re-assignment of list. |
| + visibility = [ "//third_party/WebKit/*" ] |
| + output_name = "blink_platform_unittests" |
| - sources = platform_test_files |
| + sources = platform_test_files |
| - sources += [ "testing/RunAllTests.cpp" ] |
| + sources += [ "testing/RunAllTests.cpp" ] |
| - configs += [ |
| - "//third_party/WebKit/Source/wtf:wtf_config", |
| - "//third_party/WebKit/Source:config", |
| - ] |
| + configs += [ |
| + "//third_party/WebKit/Source/wtf:wtf_config", |
| + "//third_party/WebKit/Source:config", |
| + ] |
| - deps = [ |
| - ":blink_common", |
| - ":platform", |
| - "//base", |
| - "//base/allocator", |
| - "//base/test:test_support", |
| - "//skia", |
| - "//testing/gmock", |
| - "//testing/gtest", |
| - "//third_party/WebKit/Source/wtf", |
| - "//third_party/WebKit/Source/wtf:test_support", |
| - "//url", |
| - ] |
| + deps = [ |
| + ":blink_common", |
| + ":platform", |
| + "//base", |
| + "//base/allocator", |
| + "//base/test:test_support", |
| + "//skia", |
| + "//testing/gmock", |
| + "//testing/gtest", |
| + "//third_party/WebKit/Source/wtf", |
| + "//third_party/WebKit/Source/wtf:test_support", |
| + "//url", |
| + ] |
| - defines = [ |
| - "INSIDE_BLINK", |
| - ] |
| + defines = [ |
| + "INSIDE_BLINK", |
| + ] |
| - include_dirs = [ |
| - "$root_gen_dir/blink", |
| - ] |
| + include_dirs = [ |
| + "$root_gen_dir/blink", |
| + ] |
| + } |
| } |