diff options
| author | joi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-03-26 09:57:14 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-03-26 09:57:14 +0000 |
| commit | 94856f5fbe5d71b14a4d39e494b5882e930d8c21 (patch) | |
| tree | 3547d65d6673edf5a91bca870191dc9877a85367 | |
| parent | 6138ad6c701588481ebf147546df9e96a311553e (diff) | |
| download | grit-94856f5fbe5d71b14a4d39e494b5882e930d8c21.tar.gz | |
Revert of Ignore whitelist when generating android xml. (https://codereview.chromium.org/196923002/)
Reason for revert:
This CL breaks the <if expr=""> for Android XML generation.
Original issue's description:
> 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
>
> Committed: https://code.google.com/p/grit-i18n/source/detail?r=156
TBR=joi@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=338759
Landing for aurimas@chromium.org, original patch at https://codereview.chromium.org/211743003/
Review URL: https://codereview.chromium.org/212563002
git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@157 7262f16d-afe8-6277-6482-052fa10e57b1
| -rw-r--r-- | grit/format/android_xml.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grit/format/android_xml.py b/grit/format/android_xml.py index e835e9b..d960bf4 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.Preorder(): + for item in root.ActiveDescendants(): with item: if ShouldOutputNode(item, tagged_only): yield _FormatMessage(item, lang) |