diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 20:32:27 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 20:32:27 +0000 |
| commit | 9e9d3748b78974e795062368a224d761e3e1c4fb (patch) | |
| tree | e7e294e1ba707001af18a45d956a67d158af93b5 | |
| parent | eb41b78b00e9daddcc759f77072a82c9440e4f03 (diff) | |
| download | chromium_src-9e9d3748b78974e795062368a224d761e3e1c4fb.zip chromium_src-9e9d3748b78974e795062368a224d761e3e1c4fb.tar.gz chromium_src-9e9d3748b78974e795062368a224d761e3e1c4fb.tar.bz2 | |
Changed Mac, Linux and Win Official Chrome build to drop default app CRXs in the build/installer output.
BUG=94920
TEST=Do an Official build in mac and win. Ensure that after installing the app, you can find the default apps under the install's directory structure. For win, this is under a default_apps directory, for mac, this is under a "Default Apps" directory.
Review URL: http://codereview.chromium.org/7827021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99440 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 18 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 16 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 1 |
4 files changed, 37 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 522560c..b18399e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1738,6 +1738,24 @@ ], }, ], + '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': [ + 'browser/resources/default_apps/gmail.crx', + 'browser/resources/default_apps/youtube.crx', + ], + }, + ], + }], + ], }], # targets }], # OS != "mac" ], # 'conditions' diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index eb8b8bd..d9aabe2 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -590,6 +590,22 @@ }, ], 'conditions': [ + ['branding=="Chrome"', { + 'copies': [ + { + # This location is for the Mac build. Note that the + # copying of these files for Windows and Linux is handled + # in chrome.gyp, as Mac needs to be dropped inside the + # framework. + 'destination': + '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps', + 'files': [ + 'browser/resources/default_apps/gmail.crx', + 'browser/resources/default_apps/youtube.crx', + ], + }, + ], + }], ['mac_breakpad==1', { 'variables': { # A real .dSYM is needed for dump_syms to operate on. diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 1bad4ac..9364162 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -412,6 +412,8 @@ '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/nacl_helper', '<(PRODUCT_DIR)/nacl_helper_bootstrap', + '<(PRODUCT_DIR)/default_apps/gmail.crx', + '<(PRODUCT_DIR)/default_apps/youtube.crx', ], 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index aab00a3..c87d57f 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -52,6 +52,7 @@ d3dx9_43.dll: %(VersionDir)s\ D3DCompiler_43.dll: %(VersionDir)s\
libEGL.dll: %(VersionDir)s\
libGLESv2.dll: %(VersionDir)s\
+default_apps\*.crx: %(VersionDir)s\default_apps\
[GOOGLE_CHROME]
gcswf32.dll: %(VersionDir)s\
|