Commit 1785627f authored Oct 15, 2010 by Dan Morrill Committed by Android Git Automerger Oct 15, 2010

tag, to be...

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 'b58af2b8'

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

parents 09b35d2f b58af2b8

tools/aapt/Command.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -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;