am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev (73a8c596) · Commits · e / os / android_frameworks_base

tools/aapt/ResourceTable.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -4428,6 +4428,9 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
		// Look to see if we already have an overriding v21 configuration.
		sp<ConfigList> cl = getConfigList(String16(mAssets->getPackage()),
		String16(target->getResourceType()), resourceName);
		//if (cl == NULL) {
		// fprintf(stderr, "fuuuuck\n");
		//}
		if (cl->getEntries().indexOfKey(newConfig) < 0) {
		// We don't have an overriding entry for v21, so we must duplicate this one.
		sp<XMLNode> newRoot = root->clone();
		@@ -4435,7 +4438,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
		AaptGroupEntry(newConfig), target->getResourceType());
		String8 resPath = String8::format("res/%s/%s",
		newFile->getGroupEntry().toDirName(target->getResourceType()).string(),
		target->getPath().getPathLeaf().string());
		target->getSourceFile().getPathLeaf().string());
		resPath.convertToResPath();

		// Add a resource table entry.