diff options
| author | Dan Morrill <morrildl@google.com> | 2010-12-14 11:31:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-14 11:31:29 -0800 |
| commit | 00db2213bf82c04610137a36e9190003f712952c (patch) | |
| tree | 77f5373f1c3c4523b5988e80d0589ac264f7e5be /tools | |
| parent | 2bc248b698b17fd333beae828039a8bff7604a9f (diff) | |
| parent | 0ccc8b7345eac0b507c221be47e55926cbda8957 (diff) | |
| download | frameworks_base-00db2213bf82c04610137a36e9190003f712952c.zip frameworks_base-00db2213bf82c04610137a36e9190003f712952c.tar.gz frameworks_base-00db2213bf82c04610137a36e9190003f712952c.tar.bz2 | |
am 0ccc8b73: 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 '0ccc8b7345eac0b507c221be47e55926cbda8957':
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')
| -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 16fa95a..8ac7590 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -907,10 +907,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()); |