Merge "Avoid pre-processing images when they won't be used" into gingerbread (4e1658af) · Commits · e / os / android_frameworks_base

tools/aapt/Resource.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -835,7 +835,9 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
	bool hasErrors = false;		bool hasErrors = false;

	if (drawables != NULL) {		if (drawables != NULL) {
			if (bundle->getOutputAPKFile() != NULL) {
	err = preProcessImages(bundle, assets, drawables);		err = preProcessImages(bundle, assets, drawables);
			}
	if (err == NO_ERROR) {		if (err == NO_ERROR) {
	err = makeFileResources(bundle, assets, &table, drawables, "drawable");		err = makeFileResources(bundle, assets, &table, drawables, "drawable");
	if (err != NO_ERROR) {		if (err != NO_ERROR) {