From 9f3ecf402d60c3dde2ae47485b4fea870f34f349 Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Wed, 7 May 2014 18:21:06 +0000 Subject: [PATCH] Define layout_test_helper target only on Mac and Win. BUG=368685 R=tfarina@chromium.org Review URL: https://codereview.chromium.org/268303003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268863 0039d316-1c4b-4281-b951-d872f2087c98 --- content/content_shell.gypi | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 598fb305aeee..bb385ae3d5a7 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -637,23 +637,7 @@ 'content_shell', ], }, - { - 'target_name': 'layout_test_helper', - 'type': 'executable', - 'sources': [ - 'shell/renderer/test_runner/helper/layout_test_helper_mac.mm', - 'shell/renderer/test_runner/helper/layout_test_helper_win.cc', - ], - 'conditions': [ - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - ], - }, - }], - ], - }, + { 'target_name': 'test_netscape_plugin', 'type': 'loadable_module', @@ -759,6 +743,27 @@ } ], 'conditions': [ + ['OS=="mac" or OS=="win"', { + 'targets': [ + { + 'target_name': 'layout_test_helper', + 'type': 'executable', + 'sources': [ + 'shell/renderer/test_runner/helper/layout_test_helper_mac.mm', + 'shell/renderer/test_runner/helper/layout_test_helper_win.cc', + ], + 'conditions': [ + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + ], + }, + }], + ], + }, + ], + }], # OS=="mac" or OS=="win" ['OS=="mac"', { 'targets': [ { -- 2.11.4.GIT