| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'test_shell_windows_resource_files': [ | 8 'test_shell_windows_resource_files': [ |
| 9 'resources/test_shell.rc', | 9 'resources/test_shell.rc', |
| 10 'resources/pan_east.cur', | 10 'resources/pan_east.cur', |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 '../../../net/net.gyp:net', | 116 '../../../net/net.gyp:net', |
| 117 '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', | 117 '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', |
| 118 '../../webkit.gyp:glue', | 118 '../../webkit.gyp:glue', |
| 119 '../../webkit.gyp:webkit', | 119 '../../webkit.gyp:webkit', |
| 120 ], | 120 ], |
| 121 'conditions': [ | 121 'conditions': [ |
| 122 # http://code.google.com/p/chromium/issues/detail?id=18337 | 122 # http://code.google.com/p/chromium/issues/detail?id=18337 |
| 123 ['target_arch!="x64"', { | 123 ['target_arch!="x64"', { |
| 124 'dependencies': [ | 124 'dependencies': [ |
| 125 'npapi_layout_test_plugin', | 125 'npapi_layout_test_plugin', |
| 126 ], | |
| 127 }], | |
| 128 ['OS!="win" and target_arch!="x64"', { | |
| 129 'dependencies': [ | |
| 130 'npapi_test_plugin', | 126 'npapi_test_plugin', |
| 131 ], | 127 ], |
| 132 }], | 128 }], |
| 133 ['OS=="linux"', { | 129 ['OS=="linux"', { |
| 134 'dependencies': [ | 130 'dependencies': [ |
| 135 'test_shell_resources', | 131 'test_shell_resources', |
| 136 '../../../build/linux/system.gyp:gtk', | 132 '../../../build/linux/system.gyp:gtk', |
| 137 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 133 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 138 ], | 134 ], |
| 139 # for: test_shell_gtk.cc | 135 # for: test_shell_gtk.cc |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 ], | 688 ], |
| 693 }], | 689 }], |
| 694 ], | 690 ], |
| 695 } | 691 } |
| 696 | 692 |
| 697 # Local Variables: | 693 # Local Variables: |
| 698 # tab-width:2 | 694 # tab-width:2 |
| 699 # indent-tabs-mode:nil | 695 # indent-tabs-mode:nil |
| 700 # End: | 696 # End: |
| 701 # vim: set expandtab tabstop=2 shiftwidth=2: | 697 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |