]> git.saurik.com Git - android/aapt.git/commitdiff
am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used...
authorDan Morrill <morrildl@google.com>
Fri, 15 Oct 2010 15:33:00 +0000 (08:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 15:33:00 +0000 (08:33 -0700)
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

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

Command.cpp

index eaff0f407f056982219159db75701a63651c8428..4469e68420902622cc504711f35c6c8ea845a744 100644 (file)
@@ -874,6 +874,15 @@ int doDump(Bundle* bundle)
                                     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;