diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 23:07:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 23:07:23 +0000 |
| commit | dd64fc43a6c560d3c545132adc16cd4a079f9600 (patch) | |
| tree | efe309280744b980c05b5ffbf75727adbf9f5654 | |
| parent | cb1e32ac2b5eb12ff89af5eb8074908b5f54d047 (diff) | |
| parent | effd416ee3c05c6c378614995fdbe514c8423a48 (diff) | |
| download | frameworks_base-dd64fc43a6c560d3c545132adc16cd4a079f9600.zip frameworks_base-dd64fc43a6c560d3c545132adc16cd4a079f9600.tar.gz frameworks_base-dd64fc43a6c560d3c545132adc16cd4a079f9600.tar.bz2 | |
am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit 'effd416ee3c05c6c378614995fdbe514c8423a48':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
| -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); } |