summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 01:26:40 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 01:26:40 +0000
commit3573b43d8178c8c9b4c4efc937e3ca3342bdae11 (patch)
tree7c7305894803d864aa33d4a13dd3289cc360aaf5 /chrome/chrome.gyp
parent270d97d0e083743053613360b6342d6a9d199071 (diff)
downloadchromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.zip
chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.gz
chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.bz2
Move the bookmark manager into resources.pak.
This allows for the bookmark manager to work after upgrading in the background on Linux. BUG=42770 TEST=Bookmark manager still works Review URL: http://codereview.chromium.org/2814009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 934d22f..3505c4d 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -59,6 +59,7 @@
# These resources end up in resources.pak because they are resources
# used by internal pages. Putting them in a spearate pak file makes
# it easier for us to reference them internally.
+ 'browser/resources/bookmark_manager_resources.grd',
'browser/resources/net_internals_resources.grd',
],
'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
@@ -1507,6 +1508,7 @@
'action_name': 'repack_resources',
'variables': {
'pak_inputs': [
+ '<(grit_out_dir)/bookmark_manager_resources.pak',
'<(grit_out_dir)/net_internals_resources.pak',
],
},