Merge "Add PNG and 9-patch support" (a826c4b7) · Commits · e / os / android_frameworks_base

tools/aapt2/Android.mk

+8 −2

Original line number	Diff line number	Diff line
		@@ -29,12 +29,14 @@ sources := \
		BinaryResourceParser.cpp \
		ConfigDescription.cpp \
		Files.cpp \
		Flag.cpp \
		JavaClassGenerator.cpp \
		Linker.cpp \
		Locale.cpp \
		Logger.cpp \
		ManifestParser.cpp \
		ManifestValidator.cpp \
		Png.cpp \
		ResChunkPullParser.cpp \
		Resolver.cpp \
		Resource.cpp \
		@@ -69,7 +71,10 @@ testSources := \
		XliffXmlPullParser_test.cpp \
		XmlFlattener_test.cpp

		cIncludes :=
		cIncludes := \
		external/libpng \
		external/libz

		hostLdLibs :=

		hostStaticLibs := \
		@@ -78,7 +83,8 @@ hostStaticLibs := \
		liblog \
		libcutils \
		libexpat \
		libziparchive-host
		libziparchive-host \
		libpng

		ifneq ($(strip $(USE_MINGW)),)
		hostStaticLibs += libz

tools/aapt2/Flag.cpp

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		#include "Flag.h"
		#include "StringPiece.h"

		#include <functional>
		#include <iomanip>
		#include <iostream>
		#include <string>
		#include <vector>

		namespace aapt {
		namespace flag {

		struct Flag {
		std::string name;
		std::string description;
		std::function<void(const StringPiece&)> action;
		bool required;
		bool* flagResult;
		bool parsed;
		};

		static std::vector<Flag> sFlags;
		static std::vector<std::string> sArgs;

		void optionalFlag(const StringPiece& name, const StringPiece& description,
		std::function<void(const StringPiece&)> action) {
		sFlags.push_back(
		Flag{ name.toString(), description.toString(), action, false, nullptr, false });
		}

		void requiredFlag(const StringPiece& name, const StringPiece& description,
		std::function<void(const StringPiece&)> action) {
		sFlags.push_back(
		Flag{ name.toString(), description.toString(), action, true, nullptr, false });
		}

		void optionalSwitch(const StringPiece& name, const StringPiece& description, bool* result) {
		sFlags.push_back(
		Flag{ name.toString(), description.toString(), {}, false, result, false });
		}

		static void usageAndDie(const StringPiece& command) {
		std::cerr << command << " [options]";
		for (const Flag& flag : sFlags) {
		if (flag.required) {
		std::cerr << " " << flag.name << " arg";
		}
		}
		std::cerr << " files..." << std::endl << std::endl << "Options:" << std::endl;

		for (const Flag& flag : sFlags) {
		std::string command = flag.name;
		if (!flag.flagResult) {
		command += " arg ";
		}
		std::cerr << " " << std::setw(30) << std::left << command
		<< flag.description << std::endl;
		}
		exit(1);
		}

		void parse(int argc, char** argv, const StringPiece& command) {
		for (int i = 0; i < argc; i++) {
		const StringPiece arg(argv[i]);
		if (*arg.data() != '-') {
		sArgs.emplace_back(arg.toString());
		continue;
		}

		bool match = false;
		for (Flag& flag : sFlags) {
		if (arg == flag.name) {
		match = true;
		flag.parsed = true;
		if (flag.flagResult) {
		*flag.flagResult = true;
		} else {
		i++;
		if (i >= argc) {
		std::cerr << flag.name << " missing argument." << std::endl
		<< std::endl;
		usageAndDie(command);
		}
		flag.action(argv[i]);
		}
		break;
		}
		}

		if (!match) {
		std::cerr << "unknown option '" << arg << "'." << std::endl << std::endl;
		usageAndDie(command);
		}
		}

		for (const Flag& flag : sFlags) {
		if (flag.required && !flag.parsed) {
		std::cerr << "missing required flag " << flag.name << std::endl << std::endl;
		usageAndDie(command);
		}
		}
		}

		const std::vector<std::string>& getArgs() {
		return sArgs;
		}

		} // namespace flag
		} // namespace aapt

tools/aapt2/Flag.h

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		#ifndef AAPT_FLAG_H
		#define AAPT_FLAG_H

		#include "StringPiece.h"

		#include <functional>
		#include <string>
		#include <vector>

		namespace aapt {
		namespace flag {

		void requiredFlag(const StringPiece& name, const StringPiece& description,
		std::function<void(const StringPiece&)> action);

		void optionalFlag(const StringPiece& name, const StringPiece& description,
		std::function<void(const StringPiece&)> action);

		void optionalSwitch(const StringPiece& name, const StringPiece& description, bool* result);

		void parse(int argc, char** argv, const StringPiece& command);

		const std::vector<std::string>& getArgs();

		} // namespace flag
		} // namespace aapt

		#endif // AAPT_FLAG_H

tools/aapt2/Main.cpp

+325 −717

File changed.

Preview size limit exceeded, changes collapsed.

tools/aapt2/Png.cpp

0 → 100644

+1284 −0

File added.

Preview size limit exceeded, changes collapsed.