| 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 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 'actions': [ | 564 'actions': [ |
| 565 { | 565 { |
| 566 'includes': ['chrome_repack_chrome_300_percent.gypi'] | 566 'includes': ['chrome_repack_chrome_300_percent.gypi'] |
| 567 }, | 567 }, |
| 568 ], | 568 ], |
| 569 }], | 569 }], |
| 570 ['use_ash==1', { | 570 ['use_ash==1', { |
| 571 'dependencies': [ # Update duplicate logic in repack_locales.py | 571 'dependencies': [ # Update duplicate logic in repack_locales.py |
| 572 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', | 572 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', |
| 573 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', | 573 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', |
| 574 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource
s', |
| 574 ], | 575 ], |
| 575 }], | 576 }], |
| 576 ['toolkit_views==1', { | 577 ['toolkit_views==1', { |
| 577 'dependencies': [ | 578 'dependencies': [ |
| 578 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', | 579 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', |
| 579 ], | 580 ], |
| 580 }], | 581 }], |
| 581 ['chromeos==1', { | 582 ['chromeos==1', { |
| 582 'dependencies': [ # Update duplicate logic in repack_locales.py | 583 'dependencies': [ # Update duplicate logic in repack_locales.py |
| 583 '<(DEPTH)/remoting/remoting.gyp:remoting_resources', | 584 '<(DEPTH)/remoting/remoting.gyp:remoting_resources', |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', | 741 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', |
| 741 ], | 742 ], |
| 742 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', | 743 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', |
| 743 }, | 744 }, |
| 744 'includes': [ '../build/repack_action.gypi' ], | 745 'includes': [ '../build/repack_action.gypi' ], |
| 745 }, | 746 }, |
| 746 ], | 747 ], |
| 747 }, | 748 }, |
| 748 ], # targets | 749 ], # targets |
| 749 } | 750 } |
| OLD | NEW |