]> git.saurik.com Git - android/aapt.git/commitdiff
am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name...
authorDan Morrill <morrildl@google.com>
Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)
* 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).

Command.cpp

index 661ecb1d4395145eb06b8e013d4f1fec53f66fe6..739763edca34ed831a4d7815f1f25979a4b9a951 100644 (file)
@@ -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());