diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 21:16:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:16:17 +0000 |
| commit | 217b17a915849ac50f01f9097e0e35e2b21e6235 (patch) | |
| tree | 60bdcc42ab9edfbb610237fe833d34f14f5d6ebc /tools/aapt | |
| parent | 9aa6ea106d7aec78e5ea4ea251c1eac146496fa6 (diff) | |
| parent | d3969d927eef2f04ec097244c5f2bff5e7c0689e (diff) | |
| download | frameworks_base-217b17a915849ac50f01f9097e0e35e2b21e6235.zip frameworks_base-217b17a915849ac50f01f9097e0e35e2b21e6235.tar.gz frameworks_base-217b17a915849ac50f01f9097e0e35e2b21e6235.tar.bz2 | |
am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit 'd3969d927eef2f04ec097244c5f2bff5e7c0689e':
AAPT: Fix path for final generated resources on Windows
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index a0f3190..4cca57f 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4459,6 +4459,9 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, // Look to see if we already have an overriding v21 configuration. sp<ConfigList> cl = getConfigList(String16(mAssets->getPackage()), String16(target->getResourceType()), resourceName); + //if (cl == NULL) { + // fprintf(stderr, "fuuuuck\n"); + //} if (cl->getEntries().indexOfKey(newConfig) < 0) { // We don't have an overriding entry for v21, so we must duplicate this one. sp<XMLNode> newRoot = root->clone(); @@ -4466,7 +4469,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, AaptGroupEntry(newConfig), target->getResourceType()); String8 resPath = String8::format("res/%s/%s", newFile->getGroupEntry().toDirName(target->getResourceType()).string(), - target->getPath().getPathLeaf().string()); + target->getSourceFile().getPathLeaf().string()); resPath.convertToResPath(); // Add a resource table entry. |