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