diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-04 17:40:56 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-05-12 20:41:31 -0700 |
| commit | 330edcdf1316ed599fe0eb16a64330821fd92f18 (patch) | |
| tree | 8a9bddd59f53efc836b787565ba206a1d78383e3 /tools/aapt2/Linker_test.cpp | |
| parent | a4492b418d23e3bcdb077aab5d48eb24e932fc13 (diff) | |
| download | frameworks_base-330edcdf1316ed599fe0eb16a64330821fd92f18.zip frameworks_base-330edcdf1316ed599fe0eb16a64330821fd92f18.tar.gz frameworks_base-330edcdf1316ed599fe0eb16a64330821fd92f18.tar.bz2 | |
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
Diffstat (limited to 'tools/aapt2/Linker_test.cpp')
| -rw-r--r-- | tools/aapt2/Linker_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/Linker_test.cpp b/tools/aapt2/Linker_test.cpp index 3c5b8b4..66c6717 100644 --- a/tools/aapt2/Linker_test.cpp +++ b/tools/aapt2/Linker_test.cpp @@ -32,7 +32,8 @@ struct LinkerTest : public ::testing::Test { mTable->setPackage(u"android"); mTable->setPackageId(0x01); mLinker = std::make_shared<Linker>(mTable, std::make_shared<ResourceTableResolver>( - mTable, std::make_shared<android::AssetManager>())); + mTable, std::vector<std::shared_ptr<const android::AssetManager>>()), + Linker::Options{}); // Create a few attributes for use in the tests. |