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

Unified Diff: chrome/chrome_dll.gypi

Issue 7827021: Changed mac and win Official Chrome build to drop default app CRXs in the build/installer output. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « no previous file | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
===================================================================
--- chrome/chrome_dll.gypi (revision 99240)
+++ chrome/chrome_dll.gypi (working copy)
@@ -65,6 +65,10 @@
{
'variables': {
'chrome_dll_target': 1,
+ 'default_apps_files': [
+ 'browser/resources/default_apps/gmail.crx',
+ 'browser/resources/default_apps/youtube.crx',
+ ],
'conditions' : [
['OS=="win" and optimize_with_syzygy==1', {
# On Windows we use build chrome_dll as an intermediate target
@@ -163,6 +167,19 @@
},
},
'conditions': [
+ ['buildtype=="Official" and branding=="Chrome"', {
Mark Mentovai 2011/09/01 21:55:34 I am positive that this condition is correct for t
SteveT 2011/09/01 22:39:55 Yup - it's correct for both. I've actually already
+ 'copies': [
+ {
+ # This location is for the win build. The chrome.release
Mark Mentovai 2011/09/01 21:55:34 win = Windows.
SteveT 2011/09/01 22:39:55 Done.
+ # file ensures that these files are copied into the
+ # installer.
+ 'destination': '<(PRODUCT_DIR)/default_apps',
+ 'files': [
+ '<@(default_apps_files)',
+ ]
+ },
+ ],
+ }],
['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
# Linking to a different directory and then hardlinking back
# to OutDir is a workaround to avoid having the .ilk for
@@ -590,6 +607,18 @@
},
],
'conditions': [
+ ['buildtype=="Official" and branding=="Chrome"', {
+ 'copies': [
+ {
+ # This location is for the mac build.
Mark Mentovai 2011/09/01 21:55:34 Mac has a capital M.
SteveT 2011/09/01 22:39:55 Done.
+ 'destination':
+ '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
+ 'files': [
+ '<@(default_apps_files)',
+ ]
+ },
+ ],
+ }],
['mac_breakpad==1', {
'variables': {
# A real .dSYM is needed for dump_syms to operate on.
« no previous file with comments | « no previous file | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698