diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 21:00:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:00:23 +0000 |
| commit | 73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c (patch) | |
| tree | c20eeec5beca460771aba1d11179e9889f80e3bf | |
| parent | a724d1ab4083f08958bd88e76e15b7c0af337bfc (diff) | |
| parent | 3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad (diff) | |
| download | frameworks_base-73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c.zip frameworks_base-73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c.tar.gz frameworks_base-73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c.tar.bz2 | |
am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
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. |