| 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/WebCore/WebCore.gypi', | 7 '../third_party/WebKit/WebCore/WebCore.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 # TODO: remove this helper when we have loops in GYP | 10 # TODO: remove this helper when we have loops in GYP |
| 11 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], | 11 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], |
| 12 |
| 13 # We can't turn on warnings on Windows and Linux until we upstream the |
| 14 # WebKit API. |
| 15 'conditions': [ |
| 16 ['OS=="mac"', { |
| 17 'chromium_code': 1, |
| 18 }], |
| 19 ], |
| 12 }, | 20 }, |
| 13 'targets': [ | 21 'targets': [ |
| 14 { | 22 { |
| 15 # Currently, builders assume webkit.sln builds test_shell on windows. | 23 # Currently, builders assume webkit.sln builds test_shell on windows. |
| 16 # We should change this, but for now allows trybot runs. | 24 # We should change this, but for now allows trybot runs. |
| 17 # for now. | 25 # for now. |
| 18 'target_name': 'pull_in_test_shell', | 26 'target_name': 'pull_in_test_shell', |
| 19 'type': 'none', | 27 'type': 'none', |
| 20 'conditions': [ | 28 'conditions': [ |
| 21 ['OS=="win"', { | 29 ['OS=="win"', { |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 'files': [ | 658 'files': [ |
| 651 | 659 |
| 652 '<@(webinspector_image_files)', | 660 '<@(webinspector_image_files)', |
| 653 | 661 |
| 654 ], | 662 ], |
| 655 }, | 663 }, |
| 656 ], | 664 ], |
| 657 }, | 665 }, |
| 658 ], # targets | 666 ], # targets |
| 659 } | 667 } |
| OLD | NEW |