aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1>2014-03-12 09:21:22 +0000
committerjoi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1>2014-03-12 09:21:22 +0000
commit6138ad6c701588481ebf147546df9e96a311553e (patch)
treea48868c8e962ae1e5916a5c8dbf37f25608447ad
parent77646803647fbfac846a54cc4e42cc265a320d6f (diff)
downloadgrit-6138ad6c701588481ebf147546df9e96a311553e.tar.gz
Ignore whitelist when generating android xml.
Whitelist should only apply to the resources used outside of Java. This helps us to only need to specify the whitelist for C++ resources without affecting Android XML file generation. BUG=338759 Patch from issue 196273004, landing for aurimas@chromium.org Review URL: https://codereview.chromium.org/196923002 git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@156 7262f16d-afe8-6277-6482-052fa10e57b1
-rw-r--r--grit/format/android_xml.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/grit/format/android_xml.py b/grit/format/android_xml.py
index d960bf4..e835e9b 100644
--- a/grit/format/android_xml.py
+++ b/grit/format/android_xml.py
@@ -112,7 +112,7 @@ def Format(root, lang='en', output_dir='.'):
raise Exception('env variable ANDROID_JAVA_TAGGED_ONLY must have value '
'true or false. Invalid value: %s' % tagged_only)
- for item in root.ActiveDescendants():
+ for item in root.Preorder():
with item:
if ShouldOutputNode(item, tagged_only):
yield _FormatMessage(item, lang)