diff options
| author | Guang Zhu <guangzhu@google.com> | 2017-03-21 03:53:43 +0000 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2017-03-21 03:53:43 +0000 |
| commit | 8c2df71739808d6f1aec4277fb47c191e7031164 (patch) | |
| tree | fcd72bd33919422f7c4810c2f71731f76d238806 /tools/aapt/Resource.cpp | |
| parent | c7614e5d1e8f9139cccf6ab9b78dda16b98f7656 (diff) | |
Revert "AAPT: Version <adaptive-icon> to v26"
Bug: 36462965
Bug: 35908647
This reverts commit c7614e5d1e8f9139cccf6ab9b78dda16b98f7656.
Change-Id: I25279e7c53823dad0703c7e2ea8ff91bdbc1a0f2
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 2bf52066b618..3330b1a78c1e 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1403,8 +1403,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil String8 src = it.getFile()->getPrintableSource(); err = compileXmlFile(bundle, assets, String16(it.getBaseName()), it.getFile(), &table, xmlFlags); - // Only verify IDs if there was no error and the file is non-empty. - if (err == NO_ERROR && it.getFile()->hasData()) { + if (err == NO_ERROR) { ResXMLTree block; block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true); checkForIds(src, block); @@ -1551,7 +1550,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil String8 src = it.getFile()->getPrintableSource(); err = compileXmlFile(bundle, assets, String16(it.getBaseName()), it.getFile(), &table, xmlFlags); - if (err == NO_ERROR && it.getFile()->hasData()) { + if (err == NO_ERROR) { ResXMLTree block; block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true); checkForIds(src, block); @@ -1599,7 +1598,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.xmlRoot, workItem.file, &table, xmlCompilationFlags); - if (err == NO_ERROR && workItem.file->hasData()) { + if (err == NO_ERROR) { assets->addResource(workItem.resPath.getPathLeaf(), workItem.resPath, workItem.file, |