Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'dd64fc43a6c560d3c545132adc16cd4a079f9600':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
This commit is contained in:
Adam Lesinski
2014-10-17 23:12:28 +00:00
committed by Android Git Automerger
parent 83c97babb0 dd64fc43a6
commit 10db7553ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Images.cpp
View File

@@ -1505,7 +1505,7 @@ status_t postProcessImage(const Bundle* bundle, const sp<AaptAssets>& assets,
// At this point, now that we have all the resource data, all we need to // At this point, now that we have all the resource data, all we need to
// do is compile XML files. // do is compile XML files.
if (strcmp(ext.string(), ".xml") == 0) { 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); return compileXmlFile(bundle, assets, resourceName, file, table);
} }