| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 '../third_party/WebKit/WebKit/chromium/features.gypi', | 7 '../third_party/WebKit/WebKit/chromium/features.gypi', |
| 8 '../third_party/WebKit/WebKit/chromium/WebKit.gypi', | 8 '../third_party/WebKit/WebKit/chromium/WebKit.gypi', |
| 9 '../third_party/WebKit/WebCore/WebCore.gypi', | 9 '../third_party/WebKit/WebCore/WebCore.gypi', |
| 10 'tools/test_shell/test_shell.gypi', |
| 10 ], | 11 ], |
| 11 'variables': { | 12 'variables': { |
| 12 # TODO: remove this helper when we have loops in GYP | 13 # TODO: remove this helper when we have loops in GYP |
| 13 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], | 14 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], |
| 14 | 15 |
| 15 # We can't turn on warnings on Windows and Linux until we upstream the | 16 # We can't turn on warnings on Windows and Linux until we upstream the |
| 16 # WebKit API. | 17 # WebKit API. |
| 17 'conditions': [ | 18 'conditions': [ |
| 18 ['OS=="mac"', { | 19 ['OS=="mac"', { |
| 19 'chromium_code': 1, | 20 'chromium_code': 1, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 31 '../v8/tools/profile.js', | 32 '../v8/tools/profile.js', |
| 32 '../v8/tools/profile_view.js', | 33 '../v8/tools/profile_view.js', |
| 33 '../v8/tools/splaytree.js', | 34 '../v8/tools/splaytree.js', |
| 34 '<@(devtools_js_files)', | 35 '<@(devtools_js_files)', |
| 35 ], | 36 ], |
| 36 | 37 |
| 37 'debug_devtools%': 0, | 38 'debug_devtools%': 0, |
| 38 }, | 39 }, |
| 39 'targets': [ | 40 'targets': [ |
| 40 { | 41 { |
| 41 'target_name': 'pull_in_test_shell', | |
| 42 'type': 'none', | |
| 43 'dependencies': [ | |
| 44 'tools/test_shell/test_shell.gyp:*', | |
| 45 ], | |
| 46 }, | |
| 47 { | |
| 48 'target_name': 'pull_in_webkit_unit_tests', | 42 'target_name': 'pull_in_webkit_unit_tests', |
| 49 'type': 'none', | 43 'type': 'none', |
| 50 'dependencies': [ | 44 'dependencies': [ |
| 51 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit_unit_tests' | 45 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit_unit_tests' |
| 52 ], | 46 ], |
| 53 }, | 47 }, |
| 54 { | 48 { |
| 55 'target_name': 'webkit_resources', | 49 'target_name': 'webkit_resources', |
| 56 'type': 'none', | 50 'type': 'none', |
| 57 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', | 51 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 ], | 527 ], |
| 534 }, | 528 }, |
| 535 ], # targets | 529 ], # targets |
| 536 } | 530 } |
| 537 | 531 |
| 538 # Local Variables: | 532 # Local Variables: |
| 539 # tab-width:2 | 533 # tab-width:2 |
| 540 # indent-tabs-mode:nil | 534 # indent-tabs-mode:nil |
| 541 # End: | 535 # End: |
| 542 # vim: set expandtab tabstop=2 shiftwidth=2: | 536 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |