am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so...

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

diff --combined Command.cpp
index 16fa95a1c5196d6ae40efb5742d0123dfb383ec2,739763edca34ed831a4d7815f1f25979a4b9a951..8ac7590152b4296c6e2e592a3b1fe35b27c6d243
--- 1/Command.cpp
--- 2/Command.cpp
+++ b/Command.cpp
@@@ -198,10 -198,8 +198,10 @@@ int doList(Bundle* bundle
          if (&res == NULL) {
              printf("\nNo resource table found.\n");
          } else {
 +#ifndef HAVE_ANDROID_OS
              printf("\nResource table:\n");
              res.print(false);
 +#endif
          }
  
          Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
@@@ -430,9 -428,8 +430,9 @@@ int doDump(Bundle* bundle
      }
  
      if (strcmp("resources", option) == 0) {
 +#ifndef HAVE_ANDROID_OS
          res.print(bundle->getValues());
 -
 +#endif
      } else if (strcmp("xmltree", option) == 0) {
          if (bundle->getFileSpecCount() < 3) {
              fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
@@@ -907,10 -904,10 +907,10 @@@
                                      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());