Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00db2213 authored by Dan Morrill's avatar Dan Morrill Committed by Android Git Automerger
Browse files

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

am 0ccc8b73: am 5441a9ff: 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

* commit '0ccc8b73':
  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).
parents 2bc248b6 0ccc8b73

tools/aapt/Command.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -907,10 +907,10 @@ int doDump(Bundle* bundle) 
                                    error.string());

                                    error.string());

                                goto bail;

                                goto bail;

                        }

                        }

                    } else if (tag == "uses-gl-texture") {

                    } else if (tag == "supports-gl-texture") {

                        String8 name = getAttribute(tree, NAME_ATTR, &error);

                        String8 name = getAttribute(tree, NAME_ATTR, &error);

                        if (name != "" && error == "") {

                        if (name != "" && error == "") {

                            printf("uses-gl-texture:'%s'\n", name.string());

                            printf("supports-gl-texture:'%s'\n", name.string());

                        } else {

                        } else {

                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",

                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",

                                    error.string());

                                    error.string());