diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 21:10:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:10:09 +0000 |
| commit | d3969d927eef2f04ec097244c5f2bff5e7c0689e (patch) | |
| tree | a32d322c689306ed38f659c665b4e90dcfb53d05 /tools/aapt/ResourceTable.cpp | |
| parent | 8c857eec746307dfeb8acb6b080ecc2aa8476ece (diff) | |
| parent | 6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0 (diff) | |
am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0':
AAPT: Fix path for final generated resources on Windows
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -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 c003fa6a6b26..4587a4bfa1f0 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4428,6 +4428,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(); @@ -4435,7 +4438,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. |