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

Merge "AAPT2: binary parser should be more lenient with files" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-29 21:39:26 +00:00
committed by Android (Google) Code Review
parent f6bc1402ed 742888f0fd
commit 557a0c50a0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt2/cmd/Optimize.cpp
View File

@@ -213,10 +213,10 @@ class OptimizeCommand {
if (file_ref->file == nullptr) {
ResourceNameRef name(pkg->name, type->type, entry->name);
context_->GetDiagnostics()->Error(DiagMessage(file_ref->GetSource())
context_->GetDiagnostics()->Warn(DiagMessage(file_ref->GetSource())
<< "file for resource " << name << " with config '"
<< config_value->config << "' not found");
return false;
continue;
}
const StringPiece entry_name = entry->name;

3
tools/aapt2/unflatten/BinaryResourceParser.cpp
View File

@@ -439,11 +439,10 @@ std::unique_ptr<Item> BinaryResourceParser::ParseValue(const ResourceNameRef& na
if (file_ref != nullptr) {
file_ref->file = files_->FindFile(*file_ref->path);
if (file_ref->file == nullptr) {
context_->GetDiagnostics()->Error(DiagMessage() << "resource " << name << " for config '"
context_->GetDiagnostics()->Warn(DiagMessage() << "resource " << name << " for config '"
<< config << "' is a file reference to '"
<< *file_ref->path
<< "' but no such path exists");
return {};
}
}
}