Commit b4f41119 authored Jan 12, 2010 by Ying Wang Committed by Android Git Automerger Jan 12, 2010

am a1d08886: Merge "Only output proguard keep for nonempty attribute name in...

am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair

Merge commit 'a1d08886' into eclair-plus-aosp

* commit 'a1d08886':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.

parents 202a6734 a1d08886

tools/aapt/Resource.cpp

+25 −23

Original line number	Diff line number	Diff line
		@@ -1745,6 +1745,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass
		fprintf(stderr, "ERROR: %s\n", error.string());
		return -1;
		}
		if (name.length() > 0) {
		// asdf --> package.asdf
		// .asdf .a.b --> package.asdf package.a.b
		// asdf.adsf --> asdf.asdf
		@@ -1773,6 +1774,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass
		}
		}
		}
		}

		return NO_ERROR;
		}