diff options
| author | 2015-11-30 21:08:00 +0000 | |
|---|---|---|
| committer | 2015-11-30 21:08:00 +0000 | |
| commit | ebb3a763962bec8fdcd1c7c63ae910f865fd5972 (patch) | |
| tree | 16c7a570923444eb37a341a2c048a4fa0ecc9707 /tools/aapt/Resource.cpp | |
| parent | f9b40659e6df5e4efd759448d4ca7ecb57b8edac (diff) | |
| parent | 5b9847ca3fbcd0bb2528dd2b4c0b789e2d501684 (diff) | |
Merge "Revert "Implement AAPT Bundle format""
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index f1a8f1c5f170..e22e76de66c2 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1537,14 +1537,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil std::queue<CompileResourceWorkItem>& workQueue = table.getWorkQueue(); while (!workQueue.empty()) { CompileResourceWorkItem& workItem = workQueue.front(); - if (workItem.xmlRoot != NULL) { - err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.xmlRoot, - workItem.file, &table, xmlFlags); - } else { - err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.file, - &table, xmlFlags); - } - + err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.file, &table, xmlFlags); if (err == NO_ERROR) { assets->addResource(workItem.resPath.getPathLeaf(), workItem.resPath, |