From 330edcdf1316ed599fe0eb16a64330821fd92f18 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 4 May 2015 17:40:56 -0700 Subject: AAPT2: Support static lib referencing static lib When a static library A references static library B, and app C references both A and B, we get the following symbol merging, symbols from library B get imported twice. We must only check that symbol references to library B are valid when building library A. We should only merge all the symbols when building final app C. Change-Id: I23cba33b0901dcbb5328d9c9dfaa6a979c073c36 --- tools/aapt2/JavaClassGenerator_test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/aapt2/JavaClassGenerator_test.cpp') diff --git a/tools/aapt2/JavaClassGenerator_test.cpp b/tools/aapt2/JavaClassGenerator_test.cpp index d4341b6903a0..b385ff4828e1 100644 --- a/tools/aapt2/JavaClassGenerator_test.cpp +++ b/tools/aapt2/JavaClassGenerator_test.cpp @@ -95,8 +95,9 @@ TEST_F(JavaClassGeneratorTest, EmitPackageMangledSymbols) { SourceLine{ "lib.xml", 33 }, util::make_unique())); ASSERT_TRUE(mTable->merge(std::move(table))); - Linker linker(mTable, std::make_shared(mTable, - std::map())); + Linker linker(mTable, + std::make_shared(mTable, std::map()), + {}); ASSERT_TRUE(linker.linkAndValidate()); JavaClassGenerator generator(mTable, {}); @@ -130,7 +131,7 @@ TEST_F(JavaClassGeneratorTest, EmitOtherPackagesAttributesInStyleable) { { ResourceName{ u"com.lib", ResourceType::kAttr, u"bar" }, ResourceId{ 0x02, 0x01, 0x0000 } }})); - Linker linker(mTable, resolver); + Linker linker(mTable, resolver, {}); ASSERT_TRUE(linker.linkAndValidate()); JavaClassGenerator generator(mTable, {}); -- cgit v1.2.3