diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-05-17 16:07:45 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-05-23 19:57:33 +0000 |
| commit | 60d9c2fd55ef8e64ab3f39980b78389cd1317ee5 (patch) | |
| tree | 7e255367c0ce3066bda0f4ef1fe32c23fe3fe382 /tools/aapt2/cmd/Compile.cpp | |
| parent | 80bf2641c4450eff7cc08aad1467efc401d62d43 (diff) | |
AAPT2: improve some error messages
Test: manual
Change-Id: I11c96f8c825ffd43b7f68cb24f2c0746d75845f5
Diffstat (limited to 'tools/aapt2/cmd/Compile.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Compile.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp index 5adf04a4dcbb..cc1cd5cf941e 100644 --- a/tools/aapt2/cmd/Compile.cpp +++ b/tools/aapt2/cmd/Compile.cpp @@ -145,7 +145,7 @@ static bool LoadInputFilesFromDir(IAaptContext* context, const CompileOptions& o const std::string& root_dir = options.res_dir.value(); std::unique_ptr<DIR, decltype(closedir)*> d(opendir(root_dir.data()), closedir); if (!d) { - context->GetDiagnostics()->Error(DiagMessage() + context->GetDiagnostics()->Error(DiagMessage(root_dir) << "failed to open directory: " << android::base::SystemErrorCodeToString(errno)); return false; } @@ -164,7 +164,7 @@ static bool LoadInputFilesFromDir(IAaptContext* context, const CompileOptions& o std::unique_ptr<DIR, decltype(closedir)*> subdir(opendir(prefix_path.data()), closedir); if (!subdir) { - context->GetDiagnostics()->Error(DiagMessage() + context->GetDiagnostics()->Error(DiagMessage(prefix_path) << "failed to open directory: " << android::base::SystemErrorCodeToString(errno)); return false; } @@ -180,7 +180,7 @@ static bool LoadInputFilesFromDir(IAaptContext* context, const CompileOptions& o std::string err_str; Maybe<ResourcePathData> path_data = ExtractResourcePathData(full_path, &err_str); if (!path_data) { - context->GetDiagnostics()->Error(DiagMessage() << err_str); + context->GetDiagnostics()->Error(DiagMessage(full_path) << err_str); return false; } @@ -198,6 +198,7 @@ static bool CompileTable(IAaptContext* context, const CompileOptions& options, std::ifstream fin(path_data.source.path, std::ifstream::binary); if (!fin) { context->GetDiagnostics()->Error(DiagMessage(path_data.source) + << "failed to open file: " << android::base::SystemErrorCodeToString(errno)); return false; } @@ -395,6 +396,7 @@ static bool CompileXml(IAaptContext* context, const CompileOptions& options, std::ifstream fin(path_data.source.path, std::ifstream::binary); if (!fin) { context->GetDiagnostics()->Error(DiagMessage(path_data.source) + << "failed to open file: " << android::base::SystemErrorCodeToString(errno)); return false; } @@ -480,6 +482,7 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options, std::string content; if (!android::base::ReadFileToString(path_data.source.path, &content)) { context->GetDiagnostics()->Error(DiagMessage(path_data.source) + << "failed to open file: " << android::base::SystemErrorCodeToString(errno)); return false; } |