From: Dan Morrill <morrildl@google.com>
Date: Fri, 15 Oct 2010 15:33:00 +0000 (-0700)
Subject: am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/5d85c6dedf7a936383c23ded6104fc714650c967?hp=-c

am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread

Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
---

5d85c6dedf7a936383c23ded6104fc714650c967
diff --combined Command.cpp
index eaff0f4,873ebac..4469e68
--- a/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",
@@@ -392,9 -390,8 +392,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");
@@@ -874,6 -871,15 +874,15 @@@
                                      error.string());
                                  goto bail;
                          }
+                     } else if (tag == "uses-gl-texture") {
+                         String8 name = getAttribute(tree, NAME_ATTR, &error);
+                         if (name != "" && error == "") {
+                             printf("uses-gl-texture:'%s'\n", name.string());
+                         } else {
+                             fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+                                     error.string());
+                                 goto bail;
+                         }
                      }
                  } else if (depth == 3 && withinApplication) {
                      withinActivity = false;