diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 21:05:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:05:04 +0000 |
| commit | 6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0 (patch) | |
| tree | 848766db2a3fb3768eaa4ea0ed478b44dd2605e4 | |
| parent | 12d808a24f4af9a127ae851edd06339b77020178 (diff) | |
| parent | 73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c (diff) | |
| download | frameworks_base-6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0.zip frameworks_base-6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0.tar.gz frameworks_base-6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0.tar.bz2 | |
am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
AAPT: Fix path for final generated resources on Windows
| -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 c003fa6..4587a4b 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. |