Merge "AAPT2: improve some error messages" (2a11cb3b) · Commits · e / os / android_frameworks_base

tools/aapt2/cmd/Compile.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

tools/aapt2/compile/PngChunkFilter.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ PngChunkFilter::PngChunkFilter(const StringPiece& data) : data_(data) {
		window_start_ = 0;
		window_end_ = kPngSignatureSize;
		} else {
		error_msg_ = "PNG does not start with PNG signature";
		error_msg_ = "file does not start with PNG signature";
		}
		}

tools/aapt2/compile/PngCrunch.cpp

+11 −9

Original line number	Diff line number	Diff line
		@@ -142,19 +142,24 @@ static void WriteDataToStream(png_structp png_ptr, png_bytep buffer, png_size_t
		}

		std::unique_ptr<Image> ReadPng(IAaptContext* context, const Source& source, io::InputStream* in) {
		// Create a diagnostics that has the source information encoded.
		SourcePathDiagnostics source_diag(source, context->GetDiagnostics());

		// Read the first 8 bytes of the file looking for the PNG signature.
		// Bail early if it does not match.
		const png_byte* signature;
		size_t buffer_size;
		if (!in->Next((const void**)&signature, &buffer_size)) {
		context->GetDiagnostics()->Error(DiagMessage()
		<< android::base::SystemErrorCodeToString(errno));
		if (in->HadError()) {
		source_diag.Error(DiagMessage() << "failed to read PNG signature: " << in->GetError());
		} else {
		source_diag.Error(DiagMessage() << "not enough data for PNG signature");
		}
		return {};
		}

		if (buffer_size < kPngSignatureSize \|\| png_sig_cmp(signature, 0, kPngSignatureSize) != 0) {
		context->GetDiagnostics()->Error(DiagMessage()
		<< "file signature does not match PNG signature");
		source_diag.Error(DiagMessage() << "file signature does not match PNG signature");
		return {};
		}

		@@ -166,21 +171,18 @@ std::unique_ptr<Image> ReadPng(IAaptContext* context, const Source& source, io::
		// version of libpng.
		png_structp read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
		if (read_ptr == nullptr) {
		context->GetDiagnostics()->Error(DiagMessage() << "failed to create libpng read png_struct");
		source_diag.Error(DiagMessage() << "failed to create libpng read png_struct");
		return {};
		}

		// Create and initialize the memory for image header and data.
		png_infop info_ptr = png_create_info_struct(read_ptr);
		if (info_ptr == nullptr) {
		context->GetDiagnostics()->Error(DiagMessage() << "failed to create libpng read png_info");
		source_diag.Error(DiagMessage() << "failed to create libpng read png_info");
		png_destroy_read_struct(&read_ptr, nullptr, nullptr);
		return {};
		}

		// Create a diagnostics that has the source information encoded.
		SourcePathDiagnostics source_diag(source, context->GetDiagnostics());

		// Automatically release PNG resources at end of scope.
		PngReadStructDeleter png_read_deleter(read_ptr, info_ptr);