diff options
| author | 2010-12-14 11:27:20 -0800 | |
|---|---|---|
| committer | 2010-12-14 11:27:20 -0800 | |
| commit | 5441a9ff2128cf2c5088974c74b79d2d1734f755 (patch) | |
| tree | ef9a048ff6c4fdd3c32c23880d8d19c0f72b9f61 | |
| parent | a848d3445090e114cbfe61f1c7449122a665fba6 (diff) | |
| parent | 096b67f65510a5076f1f845f9e19dda2b30ea6bb (diff) | |
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
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
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()); |