Commit b58af2b8 authored Oct 13, 2010 by Dan Morrill Committed by Android Git Automerger Oct 13, 2010

tag, to be used to enable...

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 '5c62ab0a' into gingerbread-plus-aosp

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

parents 89b73a75 5c62ab0a

tools/aapt/Command.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -871,6 +871,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;