diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 23:17:52 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 23:17:52 +0000 |
| commit | d36540e90a608afc57b600d0981b906d6c94ab8f (patch) | |
| tree | 58d2eb61e202a6e49e1b84ec99eae7f394d12493 | |
| parent | 445d4ce3fed05b3bd6df61849f2178e6110d181a (diff) | |
| download | chromium_src-d36540e90a608afc57b600d0981b906d6c94ab8f.zip chromium_src-d36540e90a608afc57b600d0981b906d6c94ab8f.tar.gz chromium_src-d36540e90a608afc57b600d0981b906d6c94ab8f.tar.bz2 | |
fix the grd scanner to only include files that we're using
bug=8139
Review URL: http://codereview.chromium.org/28225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10519 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/grit/grit/scons.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py index 66d2771..09eb4e5 100644 --- a/tools/grit/grit/scons.py +++ b/tools/grit/grit/scons.py @@ -147,11 +147,8 @@ def _Scanner(file_node, env, path): node.parent.name == 'translations')): files.append(os.path.abspath(node.GetFilePath())) elif node.name == 'include': - # We depend on all resources specified in the grd file. However, some - # files are only used by official builds and aren't in the public - # repository (e.g., the Google Chrome logo). If the file doesn't exist, - # just don't add it to the file dependencies. - if os.path.exists(node.FilenameToOpen()): + # Only include files that we actually plan on using. + if node.SatisfiesOutputCondition(): files.append(node.FilenameToOpen()) # Add in the grit source files. If one of these change, we want to re-run |