Merge "Add --trace_folder to aapt2" (b496d615) · Commits · e / os / android_frameworks_base

tools/aapt2/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ cc_library_host_static {
		"ResourceValues.cpp",
		"SdkConstants.cpp",
		"StringPool.cpp",
		"trace/TraceBuffer.cpp",
		"xml/XmlActionExecutor.cpp",
		"xml/XmlDom.cpp",
		"xml/XmlPullParser.cpp",

tools/aapt2/Main.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include "cmd/Link.h"
		#include "cmd/Optimize.h"
		#include "io/FileStream.h"
		#include "trace/TraceBuffer.h"
		#include "util/Files.h"
		#include "util/Util.h"

		@@ -107,9 +108,12 @@ class DaemonCommand : public Command {
		: Command("daemon", "m"), out_(out), diagnostics_(diagnostics) {
		SetDescription("Runs aapt in daemon mode. Each subsequent line is a single parameter to the\n"
		"command. The end of an invocation is signaled by providing an empty line.");
		AddOptionalFlag("--trace_folder", "Generate systrace json trace fragment to specified folder.",
		&trace_folder_);
		}

		int Action(const std::vector<std::string>& /* args */) override {
		int Action(const std::vector<std::string>& arguments) override {
		TRACE_FLUSH_ARGS(trace_folder_ ? trace_folder_.value() : "", "daemon", arguments);
		text::Printer printer(out_);
		std::cout << "Ready" << std::endl;

		@@ -150,6 +154,7 @@ class DaemonCommand : public Command {
		private:
		io::FileOutputStream* out_;
		IDiagnostics* diagnostics_;
		Maybe<std::string> trace_folder_;
		};

		} // namespace aapt

tools/aapt2/ResourceTable.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include "NameMangler.h"
		#include "ResourceValues.h"
		#include "ValueVisitor.h"
		#include "trace/TraceBuffer.h"
		#include "text/Unicode.h"
		#include "util/Util.h"

		@@ -79,6 +80,7 @@ ResourceTablePackage* ResourceTable::FindPackageById(uint8_t id) const {
		}

		ResourceTablePackage* ResourceTable::CreatePackage(const StringPiece& name, Maybe<uint8_t> id) {
		TRACE_CALL();
		ResourceTablePackage* package = FindOrCreatePackage(name);
		if (id && !package->id) {
		package->id = id;

tools/aapt2/cmd/Command.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include "android-base/utf8.h"
		#include "androidfw/StringPiece.h"

		#include "trace/TraceBuffer.h"
		#include "util/Util.h"

		using android::base::StringPrintf;
		@@ -178,6 +179,7 @@ void Command::Usage(std::ostream* out) {
		}

		int Command::Execute(const std::vector<StringPiece>& args, std::ostream* out_error) {
		TRACE_NAME_ARGS("Command::Execute", args);
		std::vector<std::string> file_args;

		for (size_t i = 0; i < args.size(); i++) {

tools/aapt2/cmd/Compile.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		#include "io/StringStream.h"
		#include "io/Util.h"
		#include "io/ZipArchive.h"
		#include "trace/TraceBuffer.h"
		#include "util/Files.h"
		#include "util/Maybe.h"
		#include "util/Util.h"
		@@ -141,6 +142,7 @@ static std::string BuildIntermediateContainerFilename(const ResourcePathData& da
		static bool CompileTable(IAaptContext* context, const CompileOptions& options,
		const ResourcePathData& path_data, io::IFile* file, IArchiveWriter* writer,
		const std::string& output_path) {
		TRACE_CALL();
		ResourceTable table;
		{
		auto fin = file->OpenInputStream();
		@@ -286,6 +288,7 @@ static bool CompileTable(IAaptContext* context, const CompileOptions& options,
		static bool WriteHeaderAndDataToWriter(const StringPiece& output_path, const ResourceFile& file,
		io::KnownSizeInputStream* in, IArchiveWriter* writer,
		IDiagnostics* diag) {
		TRACE_CALL();
		// Start the entry so we can write the header.
		if (!writer->StartEntry(output_path, 0)) {
		diag->Error(DiagMessage(output_path) << "failed to open file");
		@@ -352,6 +355,7 @@ static bool IsValidFile(IAaptContext* context, const std::string& input_path) {
		static bool CompileXml(IAaptContext* context, const CompileOptions& options,
		const ResourcePathData& path_data, io::IFile* file, IArchiveWriter* writer,
		const std::string& output_path) {
		TRACE_CALL();
		if (context->IsVerbose()) {
		context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling XML");
		}
		@@ -451,6 +455,7 @@ static bool CompileXml(IAaptContext* context, const CompileOptions& options,
		static bool CompilePng(IAaptContext* context, const CompileOptions& options,
		const ResourcePathData& path_data, io::IFile* file, IArchiveWriter* writer,
		const std::string& output_path) {
		TRACE_CALL();
		if (context->IsVerbose()) {
		context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling PNG");
		}
		@@ -558,6 +563,7 @@ static bool CompilePng(IAaptContext* context, const CompileOptions& options,
		static bool CompileFile(IAaptContext* context, const CompileOptions& options,
		const ResourcePathData& path_data, io::IFile* file, IArchiveWriter* writer,
		const std::string& output_path) {
		TRACE_CALL();
		if (context->IsVerbose()) {
		context->GetDiagnostics()->Note(DiagMessage(path_data.source) << "compiling file");
		}
		@@ -632,6 +638,7 @@ class CompileContext : public IAaptContext {

		int Compile(IAaptContext* context, io::IFileCollection* inputs, IArchiveWriter* output_writer,
		CompileOptions& options) {
		TRACE_CALL();
		bool error = false;

		// Iterate over the input files in a stable, platform-independent manner
		@@ -707,6 +714,7 @@ int Compile(IAaptContext* context, io::IFileCollection* inputs, IArchiveWriter*
		}

		int CompileCommand::Action(const std::vector<std::string>& args) {
		TRACE_FLUSH(trace_folder_? trace_folder_.value() : "", "CompileCommand::Action");
		CompileContext context(diagnostic_);
		context.SetVerbose(options_.verbose);