diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 14:40:17 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 21:46:52 +0000 |
| commit | 9306a474e1b7509f4cdf252359dc301ce933ca1d (patch) | |
| tree | 6a6d1a221719c1f664fa739bdccab5872f639c35 /tools/aapt/Images.cpp | |
| parent | 09cce6f509af58e3eeaf687b63e292c222a7d769 (diff) | |
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.
Bug:18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
Diffstat (limited to 'tools/aapt/Images.cpp')
| -rw-r--r-- | tools/aapt/Images.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 56d1650c3652..5d4a6ac8e0c6 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -1491,7 +1491,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 // 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); } |