From 3ff86fc88d1dfe4ee0b9053031af042dcdb2e2fd Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Thu, 12 Feb 2009 18:41:09 +0000 Subject: 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 --- tools/grit/grit/format/data_pack.py | 2 ++ 1 file changed, 2 insertions(+) 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] -- cgit v1.1