From aff7c2447df1ddfe094628317b6d22121cd657f8 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 20 Oct 2014 12:15:25 -0700 Subject: AAPT: Fix path for final generated resources on Windows Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92 --- tools/aapt/ResourceTable.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/aapt/ResourceTable.cpp') diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index c003fa6a6b26..4587a4bfa1f0 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4428,6 +4428,9 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, // Look to see if we already have an overriding v21 configuration. sp 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 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. -- cgit v1.2.3-59-g8ed1b