summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author Dan Morrill <morrildl@google.com> 2010-12-14 11:28:50 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-12-14 11:28:50 -0800
commit0ccc8b7345eac0b507c221be47e55926cbda8957 (patch)
treef8e5cc12e260b2dbbe72cbd7c767816782c7f5c2 /tools/aapt/Command.cpp
parent7afa161368308e78bb4a66b4fd32558dfd556776 (diff)
parent5441a9ff2128cf2c5088974c74b79d2d1734f755 (diff)
am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755': GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Diffstat (limited to 'tools/aapt/Command.cpp')
-rw-r--r--tools/aapt/Command.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 661ecb1d4395..739763edca34 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -904,10 +904,10 @@ int doDump(Bundle* bundle)
error.string());
goto bail;
}
- } else if (tag == "uses-gl-texture") {
+ } else if (tag == "supports-gl-texture") {
String8 name = getAttribute(tree, NAME_ATTR, &error);
if (name != "" && error == "") {
- printf("uses-gl-texture:'%s'\n", name.string());
+ printf("supports-gl-texture:'%s'\n", name.string());
} else {
fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
error.string());