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/MockResolver.h | |
| 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/MockResolver.h')
| -rw-r--r-- | tools/aapt2/MockResolver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/MockResolver.h b/tools/aapt2/MockResolver.h index 48ff6a6..0c9b954 100644 --- a/tools/aapt2/MockResolver.h +++ b/tools/aapt2/MockResolver.h @@ -34,7 +34,7 @@ struct MockResolver : public IResolver { MockResolver(const std::shared_ptr<ResourceTable>& table, const std::map<ResourceName, ResourceId>& items) : mResolver(std::make_shared<ResourceTableResolver>( - table, std::make_shared<const android::AssetManager>())), + table, std::vector<std::shared_ptr<const android::AssetManager>>())), mAttr(false, android::ResTable_map::TYPE_ANY), mItems(items) { } |