Chromium Code Reviews| 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. |