AAPT2: Separate out the various steps (1ab598f4) · Commits · e / os / android_frameworks_base

tools/aapt2/Android.mk

+46 −37

Original line number	Diff line number	Diff line
		@@ -25,62 +25,71 @@ LOCAL_PATH:= $(call my-dir)

		main := Main.cpp
		sources := \
		BigBuffer.cpp \
		BinaryResourceParser.cpp \
		BindingXmlPullParser.cpp \
		compile/IdAssigner.cpp \
		compile/Png.cpp \
		compile/XmlIdCollector.cpp \
		flatten/Archive.cpp \
		flatten/TableFlattener.cpp \
		flatten/XmlFlattener.cpp \
		link/AutoVersioner.cpp \
		link/PrivateAttributeMover.cpp \
		link/ReferenceLinker.cpp \
		link/TableMerger.cpp \
		link/XmlReferenceLinker.cpp \
		process/SymbolTable.cpp \
		unflatten/BinaryResourceParser.cpp \
		unflatten/ResChunkPullParser.cpp \
		util/BigBuffer.cpp \
		util/Files.cpp \
		util/Util.cpp \
		ConfigDescription.cpp \
		Debug.cpp \
		Files.cpp \
		Flag.cpp \
		Flags.cpp \
		JavaClassGenerator.cpp \
		Linker.cpp \
		Locale.cpp \
		Logger.cpp \
		ManifestMerger.cpp \
		ManifestParser.cpp \
		ManifestValidator.cpp \
		Png.cpp \
		ProguardRules.cpp \
		ResChunkPullParser.cpp \
		Resource.cpp \
		ResourceParser.cpp \
		ResourceTable.cpp \
		ResourceTableResolver.cpp \
		ResourceUtils.cpp \
		ResourceValues.cpp \
		SdkConstants.cpp \
		StringPool.cpp \
		TableFlattener.cpp \
		Util.cpp \
		ScopedXmlPullParser.cpp \
		SourceXmlPullParser.cpp \
		XliffXmlPullParser.cpp \
		XmlDom.cpp \
		XmlFlattener.cpp \
		ZipEntry.cpp \
		ZipFile.cpp
		XmlPullParser.cpp

		testSources := \
		BigBuffer_test.cpp \
		BindingXmlPullParser_test.cpp \
		Compat_test.cpp \
		compile/IdAssigner_test.cpp \
		compile/XmlIdCollector_test.cpp \
		flatten/FileExportWriter_test.cpp \
		flatten/TableFlattener_test.cpp \
		flatten/XmlFlattener_test.cpp \
		link/AutoVersioner_test.cpp \
		link/PrivateAttributeMover_test.cpp \
		link/ReferenceLinker_test.cpp \
		link/TableMerger_test.cpp \
		link/XmlReferenceLinker_test.cpp \
		process/SymbolTable_test.cpp \
		unflatten/FileExportHeaderReader_test.cpp \
		util/BigBuffer_test.cpp \
		util/Maybe_test.cpp \
		util/StringPiece_test.cpp \
		util/Util_test.cpp \
		ConfigDescription_test.cpp \
		JavaClassGenerator_test.cpp \
		Linker_test.cpp \
		Locale_test.cpp \
		ManifestMerger_test.cpp \
		ManifestParser_test.cpp \
		Maybe_test.cpp \
		NameMangler_test.cpp \
		ResourceParser_test.cpp \
		Resource_test.cpp \
		ResourceParser_test.cpp \
		ResourceTable_test.cpp \
		ScopedXmlPullParser_test.cpp \
		StringPiece_test.cpp \
		ResourceUtils_test.cpp \
		StringPool_test.cpp \
		Util_test.cpp \
		XliffXmlPullParser_test.cpp \
		ValueVisitor_test.cpp \
		XmlDom_test.cpp \
		XmlFlattener_test.cpp
		XmlPullParser_test.cpp

		toolSources := \
		compile/Compile.cpp \
		link/Link.cpp

		hostLdLibs :=

		@@ -101,7 +110,7 @@ else
		endif

		cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG
		cppFlags := -std=c++11 -Wno-missing-field-initializers -Wno-unused-private-field
		cppFlags := -std=c++11 -Wno-missing-field-initializers -fno-exceptions

		# ==========================================================
		# Build the host static library: libaapt2
		@@ -139,7 +148,7 @@ include $(BUILD_HOST_NATIVE_TEST)
		include $(CLEAR_VARS)
		LOCAL_MODULE := aapt2

		LOCAL_SRC_FILES := $(main)
		LOCAL_SRC_FILES := $(main) $(toolSources)

		LOCAL_STATIC_LIBRARIES += libaapt2 $(hostStaticLibs)
		LOCAL_LDLIBS += $(hostLdLibs)

tools/aapt2/BindingXmlPullParser.cpp

deleted100644 → 0

+0 −268

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "BindingXmlPullParser.h"
		#include "Util.h"

		#include <iostream>
		#include <sstream>
		#include <string>
		#include <vector>

		namespace aapt {

		constexpr const char16_t* kBindingNamespaceUri = u"http://schemas.android.com/apk/binding";
		constexpr const char16_t* kAndroidNamespaceUri = u"http://schemas.android.com/apk/res/android";
		constexpr const char16_t* kVariableTagName = u"variable";
		constexpr const char* kBindingTagPrefix = "android:binding_";

		BindingXmlPullParser::BindingXmlPullParser(const std::shared_ptr<XmlPullParser>& parser) :
		mParser(parser), mOverride(false), mNextTagId(0) {
		}

		bool BindingXmlPullParser::readVariableDeclaration() {
		VarDecl var;

		const auto endAttrIter = mParser->endAttributes();
		for (auto attrIter = mParser->beginAttributes(); attrIter != endAttrIter; ++attrIter) {
		if (!attrIter->namespaceUri.empty()) {
		continue;
		}

		if (attrIter->name == u"name") {
		var.name = util::utf16ToUtf8(attrIter->value);
		} else if (attrIter->name == u"type") {
		var.type = util::utf16ToUtf8(attrIter->value);
		}
		}

		XmlPullParser::skipCurrentElement(mParser.get());

		if (var.name.empty()) {
		mLastError = "variable declaration missing name";
		return false;
		}

		if (var.type.empty()) {
		mLastError = "variable declaration missing type";
		return false;
		}

		mVarDecls.push_back(std::move(var));
		return true;
		}

		bool BindingXmlPullParser::readExpressions() {
		mOverride = true;
		std::vector<XmlPullParser::Attribute> expressions;
		std::string idValue;

		const auto endAttrIter = mParser->endAttributes();
		for (auto attr = mParser->beginAttributes(); attr != endAttrIter; ++attr) {
		if (attr->namespaceUri == kAndroidNamespaceUri && attr->name == u"id") {
		idValue = util::utf16ToUtf8(attr->value);
		} else {
		StringPiece16 value = util::trimWhitespace(attr->value);
		if (util::stringStartsWith<char16_t>(value, u"@{") &&
		util::stringEndsWith<char16_t>(value, u"}")) {
		// This is attribute's value is an expression of the form
		// @{expression}. We need to capture the expression inside.
		expressions.push_back(XmlPullParser::Attribute{
		attr->namespaceUri,
		attr->name,
		value.substr(2, value.size() - 3).toString()
		});
		} else {
		// This is a normal attribute, use as is.
		mAttributes.emplace_back(*attr);
		}
		}
		}

		// Check if we have any expressions.
		if (!expressions.empty()) {
		// We have expressions, so let's assign the target a tag number
		// and add it to our targets list.
		int32_t targetId = mNextTagId++;
		mTargets.push_back(Target{
		util::utf16ToUtf8(mParser->getElementName()),
		idValue,
		targetId,
		std::move(expressions)
		});

		std::stringstream numGen;
		numGen << kBindingTagPrefix << targetId;
		mAttributes.push_back(XmlPullParser::Attribute{
		std::u16string(kAndroidNamespaceUri),
		std::u16string(u"tag"),
		util::utf8ToUtf16(numGen.str())
		});
		}
		return true;
		}

		XmlPullParser::Event BindingXmlPullParser::next() {
		// Clear old state in preparation for the next event.
		mOverride = false;
		mAttributes.clear();

		while (true) {
		Event event = mParser->next();
		if (event == Event::kStartElement) {
		if (mParser->getElementNamespace().empty() &&
		mParser->getElementName() == kVariableTagName) {
		// This is a variable tag. Record data from it, and
		// then discard the entire element.
		if (!readVariableDeclaration()) {
		// mLastError is set, so getEvent will return kBadDocument.
		return getEvent();
		}
		continue;
		} else {
		// Check for expressions of the form @{} in attribute text.
		const auto endAttrIter = mParser->endAttributes();
		for (auto attr = mParser->beginAttributes(); attr != endAttrIter; ++attr) {
		StringPiece16 value = util::trimWhitespace(attr->value);
		if (util::stringStartsWith<char16_t>(value, u"@{") &&
		util::stringEndsWith<char16_t>(value, u"}")) {
		if (!readExpressions()) {
		return getEvent();
		}
		break;
		}
		}
		}
		} else if (event == Event::kStartNamespace \|\| event == Event::kEndNamespace) {
		if (mParser->getNamespaceUri() == kBindingNamespaceUri) {
		// Skip binding namespace tags.
		continue;
		}
		}
		return event;
		}
		return Event::kBadDocument;
		}

		bool BindingXmlPullParser::writeToFile(std::ostream& out) const {
		out << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
		out << "<Layout directory=\"\" layout=\"\" layoutId=\"\">\n";

		// Write the variables.
		out << " <Variables>\n";
		for (const VarDecl& v : mVarDecls) {
		out << " <entries name=\"" << v.name << "\" type=\"" << v.type << "\"/>\n";
		}
		out << " </Variables>\n";

		// Write the imports.

		std::stringstream tagGen;

		// Write the targets.
		out << " <Targets>\n";
		for (const Target& t : mTargets) {
		tagGen.str({});
		tagGen << kBindingTagPrefix << t.tagId;
		out << " <Target boundClass=\"" << t.className << "\" id=\"" << t.id
		<< "\" tag=\"" << tagGen.str() << "\">\n";
		out << " <Expressions>\n";
		for (const XmlPullParser::Attribute& a : t.expressions) {
		out << " <Expression attribute=\"" << a.namespaceUri << ":" << a.name
		<< "\" text=\"" << a.value << "\"/>\n";
		}
		out << " </Expressions>\n";
		out << " </Target>\n";
		}
		out << " </Targets>\n";

		out << "</Layout>\n";
		return bool(out);
		}

		XmlPullParser::const_iterator BindingXmlPullParser::beginAttributes() const {
		if (mOverride) {
		return mAttributes.begin();
		}
		return mParser->beginAttributes();
		}

		XmlPullParser::const_iterator BindingXmlPullParser::endAttributes() const {
		if (mOverride) {
		return mAttributes.end();
		}
		return mParser->endAttributes();
		}

		size_t BindingXmlPullParser::getAttributeCount() const {
		if (mOverride) {
		return mAttributes.size();
		}
		return mParser->getAttributeCount();
		}

		XmlPullParser::Event BindingXmlPullParser::getEvent() const {
		if (!mLastError.empty()) {
		return Event::kBadDocument;
		}
		return mParser->getEvent();
		}

		const std::string& BindingXmlPullParser::getLastError() const {
		if (!mLastError.empty()) {
		return mLastError;
		}
		return mParser->getLastError();
		}

		const std::u16string& BindingXmlPullParser::getComment() const {
		return mParser->getComment();
		}

		size_t BindingXmlPullParser::getLineNumber() const {
		return mParser->getLineNumber();
		}

		size_t BindingXmlPullParser::getDepth() const {
		return mParser->getDepth();
		}

		const std::u16string& BindingXmlPullParser::getText() const {
		return mParser->getText();
		}

		const std::u16string& BindingXmlPullParser::getNamespacePrefix() const {
		return mParser->getNamespacePrefix();
		}

		const std::u16string& BindingXmlPullParser::getNamespaceUri() const {
		return mParser->getNamespaceUri();
		}

		bool BindingXmlPullParser::applyPackageAlias(std::u16string* package,
		const std::u16string& defaultPackage) const {
		return mParser->applyPackageAlias(package, defaultPackage);
		}

		const std::u16string& BindingXmlPullParser::getElementNamespace() const {
		return mParser->getElementNamespace();
		}

		const std::u16string& BindingXmlPullParser::getElementName() const {
		return mParser->getElementName();
		}

		} // namespace aapt

tools/aapt2/BindingXmlPullParser.h

deleted100644 → 0

+0 −90

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef AAPT_BINDING_XML_PULL_PARSER_H
		#define AAPT_BINDING_XML_PULL_PARSER_H

		#include "XmlPullParser.h"

		#include <iostream>
		#include <memory>
		#include <string>

		namespace aapt {

		class BindingXmlPullParser : public XmlPullParser {
		public:
		BindingXmlPullParser(const std::shared_ptr<XmlPullParser>& parser);
		BindingXmlPullParser(const BindingXmlPullParser& rhs) = delete;

		Event getEvent() const override;
		const std::string& getLastError() const override;
		Event next() override;

		const std::u16string& getComment() const override;
		size_t getLineNumber() const override;
		size_t getDepth() const override;

		const std::u16string& getText() const override;

		const std::u16string& getNamespacePrefix() const override;
		const std::u16string& getNamespaceUri() const override;
		bool applyPackageAlias(std::u16string* package, const std::u16string& defaultPackage)
		const override;

		const std::u16string& getElementNamespace() const override;
		const std::u16string& getElementName() const override;

		const_iterator beginAttributes() const override;
		const_iterator endAttributes() const override;
		size_t getAttributeCount() const override;

		bool writeToFile(std::ostream& out) const;

		private:
		struct VarDecl {
		std::string name;
		std::string type;
		};

		struct Import {
		std::string name;
		std::string type;
		};

		struct Target {
		std::string className;
		std::string id;
		int32_t tagId;

		std::vector<XmlPullParser::Attribute> expressions;
		};

		bool readVariableDeclaration();
		bool readExpressions();

		std::shared_ptr<XmlPullParser> mParser;
		std::string mLastError;
		bool mOverride;
		std::vector<XmlPullParser::Attribute> mAttributes;
		std::vector<VarDecl> mVarDecls;
		std::vector<Target> mTargets;
		int32_t mNextTagId;
		};

		} // namespace aapt

		#endif // AAPT_BINDING_XML_PULL_PARSER_H

tools/aapt2/BindingXmlPullParser_test.cpp

deleted100644 → 0

+0 −110

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "SourceXmlPullParser.h"
		#include "BindingXmlPullParser.h"

		#include <gtest/gtest.h>
		#include <sstream>
		#include <string>

		namespace aapt {

		constexpr const char16_t* kAndroidNamespaceUri = u"http://schemas.android.com/apk/res/android";

		TEST(BindingXmlPullParserTest, SubstituteBindingExpressionsWithTag) {
		std::stringstream input;
		input << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
		<< "<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n"
		<< " xmlns:bind=\"http://schemas.android.com/apk/binding\"\n"
		<< " android:id=\"@+id/content\">\n"
		<< " <variable name=\"user\" type=\"com.android.test.User\"/>\n"
		<< " <TextView android:text=\"@{user.name}\" android:layout_width=\"wrap_content\"\n"
		<< " android:layout_height=\"wrap_content\"/>\n"
		<< "</LinearLayout>\n";
		std::shared_ptr<XmlPullParser> sourceParser = std::make_shared<SourceXmlPullParser>(input);
		BindingXmlPullParser parser(sourceParser);

		ASSERT_EQ(XmlPullParser::Event::kStartNamespace, parser.next());
		EXPECT_EQ(std::u16string(u"http://schemas.android.com/apk/res/android"),
		parser.getNamespaceUri());

		ASSERT_EQ(XmlPullParser::Event::kStartElement, parser.next());
		EXPECT_EQ(std::u16string(u"LinearLayout"), parser.getElementName());

		while (parser.next() == XmlPullParser::Event::kText) {}

		ASSERT_EQ(XmlPullParser::Event::kStartElement, parser.getEvent());
		EXPECT_EQ(std::u16string(u"TextView"), parser.getElementName());

		ASSERT_EQ(3u, parser.getAttributeCount());
		const auto endAttr = parser.endAttributes();
		EXPECT_NE(endAttr, parser.findAttribute(kAndroidNamespaceUri, u"layout_width"));
		EXPECT_NE(endAttr, parser.findAttribute(kAndroidNamespaceUri, u"layout_height"));
		EXPECT_NE(endAttr, parser.findAttribute(kAndroidNamespaceUri, u"tag"));

		while (parser.next() == XmlPullParser::Event::kText) {}

		ASSERT_EQ(XmlPullParser::Event::kEndElement, parser.getEvent());

		while (parser.next() == XmlPullParser::Event::kText) {}

		ASSERT_EQ(XmlPullParser::Event::kEndElement, parser.getEvent());
		ASSERT_EQ(XmlPullParser::Event::kEndNamespace, parser.next());
		}

		TEST(BindingXmlPullParserTest, GenerateVariableDeclarations) {
		std::stringstream input;
		input << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
		<< "<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n"
		<< " xmlns:bind=\"http://schemas.android.com/apk/binding\"\n"
		<< " android:id=\"@+id/content\">\n"
		<< " <variable name=\"user\" type=\"com.android.test.User\"/>\n"
		<< "</LinearLayout>\n";
		std::shared_ptr<XmlPullParser> sourceParser = std::make_shared<SourceXmlPullParser>(input);
		BindingXmlPullParser parser(sourceParser);

		while (XmlPullParser::isGoodEvent(parser.next())) {
		ASSERT_NE(XmlPullParser::Event::kBadDocument, parser.getEvent());
		}

		std::stringstream output;
		ASSERT_TRUE(parser.writeToFile(output));

		std::string result = output.str();
		EXPECT_NE(std::string::npos,
		result.find("<entries name=\"user\" type=\"com.android.test.User\"/>"));
		}

		TEST(BindingXmlPullParserTest, FailOnMissingNameOrTypeInVariableDeclaration) {
		std::stringstream input;
		input << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
		<< "<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n"
		<< " xmlns:bind=\"http://schemas.android.com/apk/binding\"\n"
		<< " android:id=\"@+id/content\">\n"
		<< " <variable name=\"user\"/>\n"
		<< "</LinearLayout>\n";
		std::shared_ptr<XmlPullParser> sourceParser = std::make_shared<SourceXmlPullParser>(input);
		BindingXmlPullParser parser(sourceParser);

		while (XmlPullParser::isGoodEvent(parser.next())) {}

		EXPECT_EQ(XmlPullParser::Event::kBadDocument, parser.getEvent());
		EXPECT_FALSE(parser.getLastError().empty());
		}


		} // namespace aapt

tools/aapt2/ConfigDescription.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		#include "ConfigDescription.h"
		#include "Locale.h"
		#include "SdkConstants.h"
		#include "StringPiece.h"
		#include "Util.h"
		#include "util/StringPiece.h"
		#include "util/Util.h"

		#include <androidfw/ResourceTypes.h>
		#include <string>