Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev

Browse Source 
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows
This commit is contained in:
Adam Lesinski
2014-10-20 21:00:23 +00:00
committed by Android Git Automerger
parent a724d1ab40 3f8c7dec6b
commit 73a8c5962d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt/ResourceTable.cpp
View File

@@ -4428,6 +4428,9 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
// Look to see if we already have an overriding v21 configuration. // Look to see if we already have an overriding v21 configuration.
sp<ConfigList> cl = getConfigList(String16(mAssets->getPackage()), sp<ConfigList> cl = getConfigList(String16(mAssets->getPackage()),
String16(target->getResourceType()), resourceName); String16(target->getResourceType()), resourceName);
//if (cl == NULL) {
// fprintf(stderr, "fuuuuck\n");
//}
if (cl->getEntries().indexOfKey(newConfig) < 0) { if (cl->getEntries().indexOfKey(newConfig) < 0) {
// We don't have an overriding entry for v21, so we must duplicate this one. // We don't have an overriding entry for v21, so we must duplicate this one.
sp<XMLNode> newRoot = root->clone(); sp<XMLNode> newRoot = root->clone();
@@ -4435,7 +4438,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
AaptGroupEntry(newConfig), target->getResourceType()); AaptGroupEntry(newConfig), target->getResourceType());
String8 resPath = String8::format("res/%s/%s", String8 resPath = String8::format("res/%s/%s",
newFile->getGroupEntry().toDirName(target->getResourceType()).string(), newFile->getGroupEntry().toDirName(target->getResourceType()).string(),
target->getPath().getPathLeaf().string()); target->getSourceFile().getPathLeaf().string());
resPath.convertToResPath(); resPath.convertToResPath();
// Add a resource table entry. // Add a resource table entry.