commit aff7c2447df1ddfe094628317b6d22121cd657f8
author Adam Lesinski <adamlesinski@google.com> Mon Oct 20 12:15:25 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Oct 20 12:15:25 2014 -0700
tree 02f11ac125243065e21563e262bcabec3e3b1055
parent 00831836cdeeb4a61ba10c724c3ca33280937b62

AAPT: Fix path for final generated resources on Windows

Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index c003fa6..4587a4b 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -4428,6 +4428,9 @@
     // 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 @@
                 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.