am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit 'dd64fc43a6c560d3c545132adc16cd4a079f9600':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index f9fd8249d..5ab177b 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -1505,7 +1505,7 @@
// At this point, now that we have all the resource data, all we need to
// do is compile XML files.
if (strcmp(ext.string(), ".xml") == 0) {
- String16 resourceName(parseResourceName(file->getPath().getPathLeaf()));
+ String16 resourceName(parseResourceName(file->getSourceFile().getPathLeaf()));
return compileXmlFile(bundle, assets, resourceName, file, table);
}