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