diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 18:28:26 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 18:28:26 +0000 |
| commit | d335cf2aeb85bfd2ecae02db819a79a75a827b79 (patch) | |
| tree | e7ba20be1ab8e19d3696da43d5cf1a0919936fe1 /chrome/browser | |
| parent | 0753fed7b6ecb24af3640426573434bf43902478 (diff) | |
| download | chromium_src-d335cf2aeb85bfd2ecae02db819a79a75a827b79.zip chromium_src-d335cf2aeb85bfd2ecae02db819a79a75a827b79.tar.gz chromium_src-d335cf2aeb85bfd2ecae02db819a79a75a827b79.tar.bz2 | |
Allow data_packages outputs to include flattened items without
rc_all outputs.
This fixes a bug where the code to flatten an html file was in
the rc_all output step. So if a data_package output came before
the rc_all output in the grd file, we would get a build error.
Just refactor the code to flatten for both output types (but only
flatten once).
BUG=48253
TEST=build completes succesfully
Review URL: http://codereview.chromium.org/2889001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 743bc41..8c0d8d1 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -6,8 +6,8 @@ without changes to the corresponding grd file. eadee --> <output filename="grit/browser_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="browser_resources.rc" type="rc_all" /> <output filename="browser_resources.pak" type="data_package" /> + <output filename="browser_resources.rc" type="rc_all" /> </outputs> <release seq="1"> <includes> |