summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2010-10-15 08:33:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 08:33:00 -0700
commit1785627fb36a93a1cbc69a048de6ed6412f83de9 (patch)
treeedb283e9a5c5e0fe2e5905826cfca80907bd72fa /tools/aapt
parent09b35d2fe51c59b6495df3492e12ecd5009e4cf0 (diff)
parentb58af2b8b3871436942d0e2c878c906bffaa2fb0 (diff)
downloadframeworks_base-1785627fb36a93a1cbc69a048de6ed6412f83de9.zip
frameworks_base-1785627fb36a93a1cbc69a048de6ed6412f83de9.tar.gz
frameworks_base-1785627fb36a93a1cbc69a048de6ed6412f83de9.tar.bz2
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
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Command.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index eaff0f4..4469e68 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -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;