Chromium Code Reviews| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 | 7 |
| 8 'variables': { | 8 'variables': { |
| 9 'version_py_path': 'tools/build/version.py', | 9 'version_py_path': 'tools/build/version.py', |
| 10 'version_path': 'VERSION', | 10 'version_path': 'VERSION', |
| (...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1740 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))' | 1740 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))' |
| 1741 ], | 1741 ], |
| 1742 }, | 1742 }, |
| 1743 { | 1743 { |
| 1744 'destination': '<(PRODUCT_DIR)', | 1744 'destination': '<(PRODUCT_DIR)', |
| 1745 'files': [ | 1745 'files': [ |
| 1746 '<(INTERMEDIATE_DIR)/repack/chrome.pak' | 1746 '<(INTERMEDIATE_DIR)/repack/chrome.pak' |
| 1747 ], | 1747 ], |
| 1748 }, | 1748 }, |
| 1749 ], | 1749 ], |
| 1750 'conditions': [ | |
| 1751 ['branding=="Chrome"', { | |
| 1752 'copies': [ | |
| 1753 { | |
| 1754 # This location is for the Windows and Linux builds. For | |
| 1755 # Windows, the chrome.release file ensures that these files are | |
| 1756 # copied into the installer. Note that we have a separate | |
| 1757 # section in chrome_dll.gyp to copy these files for Mac, as it | |
| 1758 # needs to be dropped inside the Versions/Frameworks | |
| 1759 # directories. | |
|
Mark Mentovai
2011/09/02 20:24:40
Just say “inside the framework” (and not “director
SteveT
2011/09/02 20:30:22
Done.
| |
| 1760 'destination': '<(PRODUCT_DIR)/default_apps', | |
| 1761 'files': [ | |
| 1762 'browser/resources/default_apps/gmail.crx', | |
| 1763 'browser/resources/default_apps/youtube.crx', | |
| 1764 ], | |
| 1765 }, | |
| 1766 ], | |
| 1767 }], | |
| 1768 ], | |
| 1750 }], # targets | 1769 }], # targets |
| 1751 }], # OS != "mac" | 1770 }], # OS != "mac" |
| 1752 ], # 'conditions' | 1771 ], # 'conditions' |
| 1753 } | 1772 } |
| OLD | NEW |