diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 17:00:16 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 17:00:16 +0000 |
| commit | 9c006698f3fc7c6378ba0e0c1215de3e5ac095ed (patch) | |
| tree | 76455d871e979981709d83d2dba9f255ea86c50a /build | |
| parent | 1600ef3397ff4e2de1ea0ed5912784b728324f1a (diff) | |
| download | chromium_src-9c006698f3fc7c6378ba0e0c1215de3e5ac095ed.zip chromium_src-9c006698f3fc7c6378ba0e0c1215de3e5ac095ed.tar.gz chromium_src-9c006698f3fc7c6378ba0e0c1215de3e5ac095ed.tar.bz2 | |
Merge 107263 - Make sure that the builder includes the search app crx in the installer. In
a previous CL I added the crx file and the corresponding change to the json
file, but forgot to add the crx file to the gyp files.
BUG=101500
TEST=Make sure the search app appears in new profiles
Review URL: http://codereview.chromium.org/8391011
TBR=rogerta@chromium.org
Review URL: http://codereview.chromium.org/8394053
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@107366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index b3a40b82..108a535 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -862,15 +862,19 @@ ], # List of default apps to install in new profiles. The first list contains # the source files as found in svn. The second list, used only for linux, - # contains the destination location for each of the files. + # contains the destination location for each of the files. When a crx + # is added or removed from the list, the chrome/browser/resources/ + # default_apps/external_extensions.json file must also be updated. 'default_apps_list': [ 'browser/resources/default_apps/external_extensions.json', 'browser/resources/default_apps/gmail.crx', + 'browser/resources/default_apps/search.crx', 'browser/resources/default_apps/youtube.crx', ], 'default_apps_list_linux_dest': [ '<(PRODUCT_DIR)/default_apps/external_extensions.json', '<(PRODUCT_DIR)/default_apps/gmail.crx', + '<(PRODUCT_DIR)/default_apps/search.crx', '<(PRODUCT_DIR)/default_apps/youtube.crx', ], }, |