From: Dan Morrill <morrildl@google.com>
Date: Tue, 14 Dec 2010 19:28:50 +0000 (-0800)
Subject: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b3a9ca1e671a74fe41d2d9cd97acc2553f3a6bc7?hp=034f2c9aac98c8c5d40667f1bf047211ed8f09f0

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).
---

diff --git a/Command.cpp b/Command.cpp
index 661ecb1..739763e 100644
--- a/Command.cpp
+++ b/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());