Merge "Only output proguard keep for nonempty attribute name in the... (a1d08886) · Commits · e / os / android_frameworks_base

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;
		}