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

Merge "AAPT2: always say which file failed to compile"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-18 10:59:42 +00:00
committed by Android (Google) Code Review
parent 25b35daba8 a3ab21f04a
commit 0857c584ae
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt2/ResourceParser.cpp
View File

@@ -714,7 +714,8 @@ bool ResourceParser::ParseResource(xml::XmlPullParser* parser,
}
}
diag_->Warn(DiagMessage(out_resource->source)
// If the resource type was not recognized, write the error and return false.
diag_->Error(DiagMessage(out_resource->source)
<< "unknown resource type '" << parser->element_name() << "'");
return false;
}

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

@@ -701,7 +701,10 @@ int Compile(IAaptContext* context, io::IFileCollection* inputs, IArchiveWriter*
}
const std::string out_path = BuildIntermediateContainerFilename(path_data);
error |= !compile_func(context, options, path_data, file, output_writer, out_path);
if (!compile_func(context, options, path_data, file, output_writer, out_path)) {
context->GetDiagnostics()->Error(DiagMessage(file->GetSource()) << "file failed to compile");
error = true;
}
}
return error ? 1 : 0;