| 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 ['enable_extensions==1', { | 560 ['enable_extensions==1', { |
| 561 'dependencies': [ # Update duplicate logic in repack_locales.py | 561 'dependencies': [ # Update duplicate logic in repack_locales.py |
| 562 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', | 562 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', |
| 563 ], | 563 ], |
| 564 }], | 564 }], |
| 565 ['enable_app_list==1', { | 565 ['enable_app_list==1', { |
| 566 'dependencies': [ | 566 'dependencies': [ |
| 567 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res
ources', | 567 '<(DEPTH)/ui/app_list/resources/app_list_resources.gyp:app_list_res
ources', |
| 568 ], | 568 ], |
| 569 }], | 569 }], |
| 570 ['OS == "mac"', { | |
| 571 'actions': [ | |
| 572 { | |
| 573 'includes': ['chrome_repack_chrome_material_100_percent.gypi'] | |
| 574 }, | |
| 575 { | |
| 576 'includes': ['chrome_repack_chrome_material_200_percent.gypi'] | |
| 577 }, | |
| 578 ], | |
| 579 }], | |
| 580 ['OS != "mac" and OS != "ios"', { | 570 ['OS != "mac" and OS != "ios"', { |
| 581 # Copy pak files to the product directory. These files will be picked | 571 # Copy pak files to the product directory. These files will be picked |
| 582 # up by the following installer scripts: | 572 # up by the following installer scripts: |
| 583 # - Windows: chrome/installer/mini_installer/chrome.release | 573 # - Windows: chrome/installer/mini_installer/chrome.release |
| 584 # - Linux: chrome/installer/linux/internal/common/installer.include | 574 # - Linux: chrome/installer/linux/internal/common/installer.include |
| 585 # Ensure that the above scripts are updated when adding or removing | 575 # Ensure that the above scripts are updated when adding or removing |
| 586 # pak files. | 576 # pak files. |
| 587 # Copying files to the product directory is not needed on the Mac | 577 # Copying files to the product directory is not needed on the Mac |
| 588 # since the framework build phase will copy them into the framework | 578 # since the framework build phase will copy them into the framework |
| 589 # bundle directly. | 579 # bundle directly. |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', | 687 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', |
| 698 ], | 688 ], |
| 699 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', | 689 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', |
| 700 }, | 690 }, |
| 701 'includes': [ '../build/repack_action.gypi' ], | 691 'includes': [ '../build/repack_action.gypi' ], |
| 702 }, | 692 }, |
| 703 ], | 693 ], |
| 704 }, | 694 }, |
| 705 ], # targets | 695 ], # targets |
| 706 } | 696 } |
| OLD | NEW |