Merge "[aapt2] Improve dump chunks for string pools, fix diff" into main (96b44541) · Commits · e / os / android_frameworks_base

libs/androidfw/StringPool.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ bool StringPool::StyleRef::operator==(const StyleRef& rhs) const {

		auto rhs_iter = rhs.entry_->spans.begin();
		for (const Span& span : entry_->spans) {
		const Span& rhs_span = *rhs_iter;
		const Span& rhs_span = *rhs_iter++;
		if (span.first_char != rhs_span.first_char \|\| span.last_char != rhs_span.last_char \|\|
		span.name != rhs_span.name) {
		return false;

+26 −1

Original line number	Diff line number	Diff line
		@@ -763,10 +763,35 @@ class ChunkPrinter {
		pool->setTo(chunk, android::util::DeviceToHost32(
		(reinterpret_cast<const ResChunk_header*>(chunk))->size));

		printer_->Print("\n");
		printer_->Print(StringPrintf(" strings: %zd styles %zd flags: %s\|%s\n", pool->size(),
		pool->styleCount(), pool->isUTF8() ? "UTF-8" : "UTF-16",
		pool->isSorted() ? "SORTED" : "NON-SORTED"));

		for (size_t i = 0; i < pool->size(); i++) {
		printer_->Print(StringPrintf("#%zd : %s\n", i, android::util::GetString(*pool, i).c_str()));
		if (i < pool->styleCount()) {
		printer_->Print(" [Style] ");
		auto maybe_style = pool->styleAt(i);
		if (!maybe_style) {
		printer_->Print("??? missing\n");
		} else {
		std::vector<const ResStringPool_span*> spans;
		for (auto style = maybe_style.value().unsafe_ptr();
		style->name.index != android::ResStringPool_span::END; ++style) {
		spans.push_back(style);
		}
		printer_->Print(StringPrintf("(%zd)", spans.size()));
		if (!spans.empty()) {
		printer_->Print(" :");
		for (const auto& span : spans) {
		printer_->Print(StringPrintf(
		" %s:%u,%u", android::util::GetString(*pool, span->name.index).c_str(),
		span->firstChar, span->lastChar));
		}
		printer_->Print("\n");
		}
		}
		}
		}
		}

+29 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,35 @@ TEST(ResourcesValuesTest, StringClones) {
		EXPECT_THAT(pool_b.strings()[0]->value, StrEq("hello"));
		}

		TEST(ResourcesValuesTest, StringEquals) {
		android::StringPool pool;

		String str(pool.MakeRef("hello", android::StringPool::Context(test::ParseConfigOrDie("en"))));
		String str2(pool.MakeRef("hello"));
		EXPECT_TRUE(str.Equals(&str2));
		EXPECT_TRUE(str2.Equals(&str));

		String str3(pool.MakeRef("how are you"));
		EXPECT_FALSE(str.Equals(&str3));
		}

		TEST(ResourcesValuesTest, StyledStringEquals) {
		android::StringPool pool;

		StyledString ss(pool.MakeRef(android::StyleString{"hello", {{"b", 0, 1}, {"u", 2, 4}}}));
		StyledString ss2(pool.MakeRef(android::StyleString{"hello", {{"b", 0, 1}, {"u", 2, 4}}}));
		StyledString ss3(pool.MakeRef(android::StyleString{"hi", {{"b", 0, 1}, {"u", 2, 4}}}));
		StyledString ss4(pool.MakeRef(android::StyleString{"hello", {{"b", 0, 1}}}));
		StyledString ss5(pool.MakeRef(android::StyleString{"hello", {{"b", 0, 1}, {"u", 3, 4}}}));
		StyledString ss6(pool.MakeRef(android::StyleString{"hello", {{"b", 0, 1}, {"s", 2, 4}}}));
		EXPECT_TRUE(ss.Equals(&ss2));
		EXPECT_TRUE(ss2.Equals(&ss));
		EXPECT_FALSE(ss.Equals(&ss3));
		EXPECT_FALSE(ss.Equals(&ss4));
		EXPECT_FALSE(ss.Equals(&ss5));
		EXPECT_FALSE(ss.Equals(&ss6));
		}

		TEST(ResourceValuesTest, StyleMerges) {
		android::StringPool pool_a;
		android::StringPool pool_b;

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ static bool EmitResourceConfigValueDiff(
		if (!value_a->Equals(value_b)) {
		std::stringstream str_stream;
		str_stream << "value " << pkg_a.name << ":" << type_a.named_type << "/" << entry_a.name
		<< " config=" << config_value_a->config << " does not match:\n";
		<< " config='" << config_value_a->config << "' does not match:\n";
		value_a->Print(&str_stream);
		str_stream << "\n vs \n";
		value_b->Print(&str_stream);

+1 −1

File changed.

Contains only whitespace changes.