diff options
Diffstat (limited to 'tools/aapt2/cmd/Compile.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Compile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp index c192d698b500..5adf04a4dcbb 100644 --- a/tools/aapt2/cmd/Compile.cpp +++ b/tools/aapt2/cmd/Compile.cpp @@ -372,6 +372,8 @@ static bool IsValidFile(IAaptContext* context, const StringPiece& input_path) { if (file_type == file::FileType::kDirectory) { context->GetDiagnostics()->Error(DiagMessage(input_path) << "resource file cannot be a directory"); + } else if (file_type == file::FileType::kNonexistant) { + context->GetDiagnostics()->Error(DiagMessage(input_path) << "file not found"); } else { context->GetDiagnostics()->Error(DiagMessage(input_path) << "not a valid resource file"); @@ -488,7 +490,7 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options, // Ensure that we only keep the chunks we care about if we end up // using the original PNG instead of the crunched one. PngChunkFilter png_chunk_filter(content); - std::unique_ptr<Image> image = ReadPng(context, &png_chunk_filter); + std::unique_ptr<Image> image = ReadPng(context, path_data.source, &png_chunk_filter); if (!image) { return false; } |