diff options
| author | tfarina <tfarina@chromium.org> | 2015-05-12 20:35:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-13 03:36:04 +0000 |
| commit | 10ae51f628f7447699baf16db52c5d74f9a96077 (patch) | |
| tree | 6b146511bcd79a61e7340fd39615cf88f63a26ae | |
| parent | 95c267180c42307f6652d6a6c19c66c09ff2e017 (diff) | |
| download | chromium_src-10ae51f628f7447699baf16db52c5d74f9a96077.zip chromium_src-10ae51f628f7447699baf16db52c5d74f9a96077.tar.gz chromium_src-10ae51f628f7447699baf16db52c5d74f9a96077.tar.bz2 | |
content: Port layout_test_helper target to GN build.
This is necessary because it is one of the dependencies of the
'blink_tests' group that should be built.
BUG=483171
R=avi@chromium.org,dpranke@chromium.org
Review URL: https://codereview.chromium.org/1131773004
Cr-Commit-Position: refs/heads/master@{#329580}
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | content/content_shell.gypi | 1 | ||||
| -rw-r--r-- | content/shell/BUILD.gn | 14 |
3 files changed, 17 insertions, 2 deletions
@@ -752,8 +752,8 @@ if (!is_ios) { if (is_win) { deps += [ + "//content/shell:layout_test_helper", #'../content/content_shell_and_tests.gyp:content_shell_crash_service', TODO(GYP) - #'../content/content_shell_and_tests.gyp:layout_test_helper', TODO(GYP) ] } @@ -764,7 +764,7 @@ if (!is_ios) { if (is_mac) { deps += [ "//breakpad:dump_syms($host_toolchain)", - #'../content/content_shell_and_tests.gyp:layout_test_helper', TODO(GYP) + "//content/shell:layout_test_helper", ] } diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 8429d9b..65ca72b 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -797,6 +797,7 @@ ['OS=="mac" or OS=="win"', { 'targets': [ { + # GN version: //content/shell:layout_test_helper 'target_name': 'layout_test_helper', 'type': 'executable', 'sources': [ diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index dddfb01..95450b5 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -541,3 +541,17 @@ if (!is_android && !is_mac) { ] } } + +if (is_mac || is_win) { + # GYP version: content/content_shell_and_tests.gyp:layout_test_helper + executable("layout_test_helper") { + sources = [ + "renderer/test_runner/helper/layout_test_helper_mac.mm", + "renderer/test_runner/helper/layout_test_helper_win.cc", + ] + + if (is_mac) { + libs = [ "AppKit.framework" ] + } + } +} |