| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'test_shell_windows_resource_files': [ | 7 'test_shell_windows_resource_files': [ |
| 8 'resources/test_shell.rc', | 8 'resources/test_shell.rc', |
| 9 'resources/pan_east.cur', | 9 'resources/pan_east.cur', |
| 10 'resources/pan_middle.cur', | 10 'resources/pan_middle.cur', |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 'repack_path': '../../../tools/data_pack/repack.py', | 169 'repack_path': '../../../tools/data_pack/repack.py', |
| 170 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', | 170 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', |
| 171 }, | 171 }, |
| 172 'conditions': [ | 172 'conditions': [ |
| 173 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { | 173 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 174 'actions': [ | 174 'actions': [ |
| 175 { | 175 { |
| 176 'action_name': 'test_shell_repack', | 176 'action_name': 'test_shell_repack', |
| 177 'variables': { | 177 'variables': { |
| 178 'pak_inputs': [ | 178 'pak_inputs': [ |
| 179 '<(SHARED_INTERMEDIATE_DIR)/gfx/gfx_resources.pak', |
| 179 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', | 180 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', |
| 180 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa
k', | 181 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa
k', |
| 181 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p
ak', | 182 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p
ak', |
| 182 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', | 183 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', |
| 183 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', | 184 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', |
| 184 ], | 185 ], |
| 185 }, | 186 }, |
| 186 'inputs': [ | 187 'inputs': [ |
| 187 '<(repack_path)', | 188 '<(repack_path)', |
| 188 '<@(pak_inputs)', | 189 '<@(pak_inputs)', |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 # ffmpeg.gyp so they don't diverge. (BUG=23602) | 325 # ffmpeg.gyp so they don't diverge. (BUG=23602) |
| 325 { | 326 { |
| 326 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', | 327 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', |
| 327 'files': [ | 328 'files': [ |
| 328 '<(PRODUCT_DIR)/libffmpegsumo.dylib', | 329 '<(PRODUCT_DIR)/libffmpegsumo.dylib', |
| 329 ], | 330 ], |
| 330 }, | 331 }, |
| 331 ], | 332 ], |
| 332 }, { # OS != "mac" | 333 }, { # OS != "mac" |
| 333 'dependencies': [ | 334 'dependencies': [ |
| 335 '<(DEPTH)/gfx/gfx.gyp:gfx_resources', |
| 334 '<(DEPTH)/net/net.gyp:net_resources', | 336 '<(DEPTH)/net/net.gyp:net_resources', |
| 335 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', | 337 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', |
| 336 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', | 338 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', |
| 337 ] | 339 ] |
| 338 }], | 340 }], |
| 339 ], | 341 ], |
| 340 }, | 342 }, |
| 341 { | 343 { |
| 342 'target_name': 'test_shell_tests', | 344 'target_name': 'test_shell_tests', |
| 343 'type': 'executable', | 345 'type': 'executable', |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 ], | 737 ], |
| 736 }], | 738 }], |
| 737 ], | 739 ], |
| 738 } | 740 } |
| 739 | 741 |
| 740 # Local Variables: | 742 # Local Variables: |
| 741 # tab-width:2 | 743 # tab-width:2 |
| 742 # indent-tabs-mode:nil | 744 # indent-tabs-mode:nil |
| 743 # End: | 745 # End: |
| 744 # vim: set expandtab tabstop=2 shiftwidth=2: | 746 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |