summaryrefslogtreecommitdiffstats
path: root/cc/blink
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-20 22:08:53 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-21 06:09:44 +0000
commit380390fc2b8257979d5a2ce830947a6db0aab15d (patch)
tree1eeadfdac5a6ab1424b0e4cfb6deffb1ccabf635 /cc/blink
parent74d4e30fb7f98d54cf44943b87c1746337721910 (diff)
downloadchromium_src-380390fc2b8257979d5a2ce830947a6db0aab15d.zip
chromium_src-380390fc2b8257979d5a2ce830947a6db0aab15d.tar.gz
chromium_src-380390fc2b8257979d5a2ce830947a6db0aab15d.tar.bz2
Enable webrtc and most of blink and content in the Mac GN build.
There are still a few linker errors from missing files. I'll try to get those fixed in a follow-on build, but this adds several thousand edges as-is. R=brettw@chromium.org BUG=431177 Review URL: https://codereview.chromium.org/746003002 Cr-Commit-Position: refs/heads/master@{#305179}
Diffstat (limited to 'cc/blink')
-rw-r--r--cc/blink/BUILD.gn37
1 files changed, 20 insertions, 17 deletions
diff --git a/cc/blink/BUILD.gn b/cc/blink/BUILD.gn
index 9fd2f33..fac991b 100644
--- a/cc/blink/BUILD.gn
+++ b/cc/blink/BUILD.gn
@@ -65,22 +65,25 @@ component("blink") {
}
# GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests
-test("cc_blink_unittests") {
- deps = [
- ":blink",
- "//base/test:run_all_unittests",
- "//base/third_party/dynamic_annotations",
- "//skia",
- "//testing/gtest",
- "//ui/gfx/geometry",
- "//ui/gfx:test_support",
- "//cc",
- "//cc:test_support",
- ]
+# TODO(GYP): make linking work on the mac.
+if (!is_mac) {
+ test("cc_blink_unittests") {
+ deps = [
+ ":blink",
+ "//base/test:run_all_unittests",
+ "//base/third_party/dynamic_annotations",
+ "//skia",
+ "//testing/gtest",
+ "//ui/gfx/geometry",
+ "//ui/gfx:test_support",
+ "//cc",
+ "//cc:test_support",
+ ]
- sources = [
- "web_animation_unittest.cc",
- "web_float_animation_curve_unittest.cc",
- "web_layer_impl_fixed_bounds_unittest.cc",
- ]
+ sources = [
+ "web_animation_unittest.cc",
+ "web_float_animation_curve_unittest.cc",
+ "web_layer_impl_fixed_bounds_unittest.cc",
+ ]
+ }
}