| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 5 'variables': { |
| 6 # Apply Chrome-specific grit settings to all of this file. | 6 # Apply Chrome-specific grit settings to all of this file. |
| 7 # The advantage is that one entry here applies to the entire file. | 7 # The advantage is that one entry here applies to the entire file. |
| 8 # The caveat is these variables cannot be merged with other variable | 8 # The caveat is these variables cannot be merged with other variable |
| 9 # dictionaries in more inner scopes. If the variable should be merged, | 9 # dictionaries in more inner scopes. If the variable should be merged, |
| 10 # consider putting them in a gypi file and including it at the right scope | 10 # consider putting them in a gypi file and including it at the right scope |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 'actions': [ | 560 'actions': [ |
| 561 { | 561 { |
| 562 'includes': ['chrome_repack_chrome_300_percent.gypi'] | 562 'includes': ['chrome_repack_chrome_300_percent.gypi'] |
| 563 }, | 563 }, |
| 564 ], | 564 ], |
| 565 }], | 565 }], |
| 566 ['use_ash==1', { | 566 ['use_ash==1', { |
| 567 'dependencies': [ # Update duplicate logic in repack_locales.py | 567 'dependencies': [ # Update duplicate logic in repack_locales.py |
| 568 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', | 568 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', |
| 569 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', | 569 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', |
| 570 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource
s', | |
| 571 ], | 570 ], |
| 572 }], | 571 }], |
| 573 ['toolkit_views==1', { | 572 ['toolkit_views==1', { |
| 574 'dependencies': [ | 573 'dependencies': [ |
| 575 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', | 574 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', |
| 576 ], | 575 ], |
| 577 }], | 576 }], |
| 578 ['chromeos==1', { | 577 ['chromeos==1', { |
| 579 'dependencies': [ # Update duplicate logic in repack_locales.py | 578 'dependencies': [ # Update duplicate logic in repack_locales.py |
| 580 '<(DEPTH)/remoting/remoting.gyp:remoting_resources', | 579 '<(DEPTH)/remoting/remoting.gyp:remoting_resources', |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', | 726 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', |
| 728 ], | 727 ], |
| 729 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', | 728 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', |
| 730 }, | 729 }, |
| 731 'includes': [ '../build/repack_action.gypi' ], | 730 'includes': [ '../build/repack_action.gypi' ], |
| 732 }, | 731 }, |
| 733 ], | 732 ], |
| 734 }, | 733 }, |
| 735 ], # targets | 734 ], # targets |
| 736 } | 735 } |
| OLD | NEW |