| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 '../build/win_precompile.gypi', | 7 '../build/win_precompile.gypi', |
| 8 '../third_party/WebKit/Source/WebKit/chromium/features.gypi', | 8 '../third_party/WebKit/Source/WebKit/chromium/features.gypi', |
| 9 'tools/test_shell/test_shell.gypi', | 9 'tools/test_shell/test_shell.gypi', |
| 10 ], | 10 ], |
| 11 'variables': { | 11 'variables': { |
| 12 'chromium_code': 1, | 12 'chromium_code': 1, |
| 13 }, | 13 }, |
| 14 'conditions': [ | 14 'targets': [ |
| 15 # TODO(dpranke): See https://bugs.webkit.org/show_bug.cgi?id=68463 , | 15 { |
| 16 # flag in build/common.gypi. | 16 'target_name': 'pull_in_webkit_unit_tests', |
| 17 ['build_webkit_exes_from_webkit_gyp==1', { | 17 'type': 'none', |
| 18 'targets': [ | 18 'dependencies': [ |
| 19 { | 19 '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit
_unit_tests' |
| 20 'target_name': 'pull_in_webkit_unit_tests', | |
| 21 'type': 'none', | |
| 22 'dependencies': [ | |
| 23 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_unit
_tests' | |
| 24 ], | |
| 25 }, | |
| 26 { | |
| 27 'target_name': 'pull_in_copy_TestNetscapePlugIn', | |
| 28 'type': 'none', | |
| 29 'dependencies': [ | |
| 30 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe
stcapePlugIn' | |
| 31 ], | |
| 32 }, | |
| 33 { | |
| 34 'target_name': 'pull_in_DumpRenderTree', | |
| 35 'type': 'none', | |
| 36 'dependencies': [ | |
| 37 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderT
ree' | |
| 38 ], | |
| 39 }, | |
| 40 ], | 20 ], |
| 41 }, { # build_webkit_exes_from_webkit_gyp==0 | 21 }, |
| 42 'targets': [ | 22 { |
| 43 { | 23 'target_name': 'pull_in_DumpRenderTree', |
| 44 'target_name': 'pull_in_webkit_unit_tests', | 24 'type': 'none', |
| 45 'type': 'none', | 25 'dependencies': [ |
| 46 'dependencies': [ | 26 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende
rTree.gyp:DumpRenderTree' |
| 47 '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:we
bkit_unit_tests' | |
| 48 ], | |
| 49 }, | |
| 50 { | |
| 51 'target_name': 'pull_in_copy_TestNetscapePlugIn', | |
| 52 'type': 'none', | |
| 53 'dependencies': [ | |
| 54 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpR
enderTree.gyp:copy_TestNetscapePlugIn' | |
| 55 ], | |
| 56 }, | |
| 57 { | |
| 58 'target_name': 'pull_in_DumpRenderTree', | |
| 59 'type': 'none', | |
| 60 'dependencies': [ | |
| 61 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpR
enderTree.gyp:DumpRenderTree' | |
| 62 ], | |
| 63 }, | |
| 64 ], | 27 ], |
| 65 }] | 28 }, |
| 66 ], # targets | 29 ], # targets |
| 67 } | 30 } |
| OLD | NEW |