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

Unified 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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/default_apps/external_extensions.json ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 102958)
+++ chrome/chrome.gyp (working copy)
@@ -1706,6 +1706,21 @@
],
},
],
+ 'conditions': [
+ ['branding=="Chrome"', {
+ 'copies': [
+ {
+ # This location is for the Windows and Linux builds. For
+ # Windows, the chrome.release file ensures that these files are
+ # copied into the installer. Note that we have a separate
+ # section in chrome_dll.gyp to copy these files for Mac, as it
+ # needs to be dropped inside the framework.
+ 'destination': '<(PRODUCT_DIR)/default_apps',
+ 'files': ['<@(default_apps_list)']
+ },
+ ],
+ }],
+ ],
}], # targets
}], # OS != "mac"
], # 'conditions'
« 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