Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: chrome/chrome.gyp

Issue 8041033: Changed Mac, Linux and Win Official Chrome build to drop default app CRXs in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Added descriptive comment to json file Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/default_apps/external_extensions.json ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))' 1699 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHAR ED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))'
1700 ], 1700 ],
1701 }, 1701 },
1702 { 1702 {
1703 'destination': '<(PRODUCT_DIR)', 1703 'destination': '<(PRODUCT_DIR)',
1704 'files': [ 1704 'files': [
1705 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1705 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1706 ], 1706 ],
1707 }, 1707 },
1708 ], 1708 ],
1709 'conditions': [
1710 ['branding=="Chrome"', {
1711 'copies': [
1712 {
1713 # This location is for the Windows and Linux builds. For
1714 # Windows, the chrome.release file ensures that these files are
1715 # copied into the installer. Note that we have a separate
1716 # section in chrome_dll.gyp to copy these files for Mac, as it
1717 # needs to be dropped inside the framework.
1718 'destination': '<(PRODUCT_DIR)/default_apps',
1719 'files': ['<@(default_apps_list)']
1720 },
1721 ],
1722 }],
1723 ],
1709 }], # targets 1724 }], # targets
1710 }], # OS != "mac" 1725 }], # OS != "mac"
1711 ], # 'conditions' 1726 ], # 'conditions'
1712 } 1727 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/default_apps/external_extensions.json ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698