diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 20:55:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-20 20:55:48 +0000 |
| commit | 3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad (patch) | |
| tree | 7bf009abea68c45b2560ecaddc7fa36f6b20a491 | |
| parent | 877ce2c42b5d423719246f5458cd66fa9fddb317 (diff) | |
| parent | aff7c2447df1ddfe094628317b6d22121cd657f8 (diff) | |
| download | base-3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad.tar.gz | |
Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
| -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. |