diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 22:55:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 22:55:25 +0000 |
| commit | 18d5d1107db296c6ac991d991fff98337f6724dd (patch) | |
| tree | 25090d947c2cf2f0d3ea0c7d745f2379807cecd4 /tools/aapt | |
| parent | e4444d0fd60293b61670345a7e2c01350c9d4f61 (diff) | |
| parent | 3cd840f4b5a2988700a6b366fa32f4565c319900 (diff) | |
| download | frameworks_base-18d5d1107db296c6ac991d991fff98337f6724dd.zip frameworks_base-18d5d1107db296c6ac991d991fff98337f6724dd.tar.gz frameworks_base-18d5d1107db296c6ac991d991fff98337f6724dd.tar.bz2 | |
am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit '3cd840f4b5a2988700a6b366fa32f4565c319900':
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 f9fd824..5ab177b 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -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 // 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); } |