diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 22:50:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-17 22:50:50 +0000 |
| commit | 3cd840f4b5a2988700a6b366fa32f4565c319900 (patch) | |
| tree | 5da7403545ff425fe86c7b0bff65cc27d018ccd6 | |
| parent | 84b4791aaf0384a334068a97c70fcda162cfadab (diff) | |
| parent | 9306a474e1b7509f4cdf252359dc301ce933ca1d (diff) | |
| download | frameworks_base-3cd840f4b5a2988700a6b366fa32f4565c319900.zip frameworks_base-3cd840f4b5a2988700a6b366fa32f4565c319900.tar.gz frameworks_base-3cd840f4b5a2988700a6b366fa32f4565c319900.tar.bz2 | |
Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
| -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 56d1650..5d4a6ac 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); } |