diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 18:41:09 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 18:41:09 +0000 |
| commit | 3ff86fc88d1dfe4ee0b9053031af042dcdb2e2fd (patch) | |
| tree | a8e67c7f7d3543d57ecdad79c61917a62930e3a4 /tools | |
| parent | b85eac27ba4da61a9169e675c6c8274adde0fe96 (diff) | |
| download | chromium_src-3ff86fc88d1dfe4ee0b9053031af042dcdb2e2fd.zip chromium_src-3ff86fc88d1dfe4ee0b9053031af042dcdb2e2fd.tar.gz chromium_src-3ff86fc88d1dfe4ee0b9053031af042dcdb2e2fd.tar.bz2 | |
Fix scons build for non-official builds.
We were trying to include all resources, even those hidden behind an
preprocessor #if.
Review URL: http://codereview.chromium.org/20311
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/grit/grit/format/data_pack.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/grit/grit/format/data_pack.py b/tools/grit/grit/format/data_pack.py index f70b49b..664cbaec 100755 --- a/tools/grit/grit/format/data_pack.py +++ b/tools/grit/grit/format/data_pack.py @@ -37,6 +37,8 @@ class DataPack(interface.ItemFormatter): def GetDataNodes(item): '''Returns a list of nodes that can be packed into the data pack file.''' nodes = [] + if (isinstance(item, misc.IfNode) and not item.IsConditionSatisfied()): + return nodes if (isinstance(item, include.IncludeNode) or isinstance(item, message.MessageNode)): return [item] |