Skip to content

Commit 5441a9f

Browse files
Dan MorrillAndroid (Google) Code Review
authored andcommitted
Merge "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)." into gingerbread
2 parents a848d34 + 096b67f commit 5441a9f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/aapt/Command.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,10 +904,10 @@ int doDump(Bundle* bundle)
904904
error.string());
905905
goto bail;
906906
}
907-
} else if (tag == "uses-gl-texture") {
907+
} else if (tag == "supports-gl-texture") {
908908
String8 name = getAttribute(tree, NAME_ATTR, &error);
909909
if (name != "" && error == "") {
910-
printf("uses-gl-texture:'%s'\n", name.string());
910+
printf("supports-gl-texture:'%s'\n", name.string());
911911
} else {
912912
fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
913913
error.string());

0 commit comments

Comments
 (0)