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

Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2017-09-05 18:53:44 +00:00
committed by Android (Google) Code Review
parent 88aa3d0f3e de7b742335
commit 1e22b33f34
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt2/cmd/Link.cpp
View File

@@ -574,6 +574,11 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, IArchiveWriter* archiv
if (file_op.xml_to_flatten) {
std::vector<std::unique_ptr<xml::XmlResource>> versioned_docs =
LinkAndVersionXmlFile(table, &file_op);
if (versioned_docs.empty()) {
error = true;
continue;
}
for (std::unique_ptr<xml::XmlResource>& doc : versioned_docs) {
std::string dst_path = file_op.dst_path;
if (doc->file.config != file_op.config) {