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

am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev

Browse Source 
* commit 'd3969d927eef2f04ec097244c5f2bff5e7c0689e':
  AAPT: Fix path for final generated resources on Windows
This commit is contained in:
Adam Lesinski
2014-10-20 21:16:17 +00:00
committed by Android Git Automerger
parent 9aa6ea106d d3969d927e
commit 217b17a915
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

@@ -4459,6 +4459,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();
@@ -4466,7 +4469,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.