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

Merge "AAPT: Allow including dependencies in dump command" into oc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2017-05-11 18:36:38 +00:00
committed by Android (Google) Code Review
parent c3b938ca5e 57fe48389f
commit 33644ff3f9
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Command.cpp
View File

@@ -762,6 +762,15 @@ int doDump(Bundle* bundle)
return 1; return 1;
} }
// Now add any dependencies passed in.
for (size_t i = 0; i < bundle->getPackageIncludes().size(); i++) {
const String8& assetPath = bundle->getPackageIncludes()[i];
if (!assets.addAssetPath(assetPath, NULL)) {
fprintf(stderr, "ERROR: included asset path %s could not be loaded\n", assetPath.string());
return 1;
}
}
// Make a dummy config for retrieving resources... we need to supply // Make a dummy config for retrieving resources... we need to supply
// non-default values for some configs so that we can retrieve resources // non-default values for some configs so that we can retrieve resources
// in the app that don't have a default. The most important of these is // in the app that don't have a default. The most important of these is