diff options
Diffstat (limited to 'tools/aapt2/ResourceTableResolver.h')
| -rw-r--r-- | tools/aapt2/ResourceTableResolver.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/aapt2/ResourceTableResolver.h b/tools/aapt2/ResourceTableResolver.h index c8e8ab7..8f6b0b5 100644 --- a/tools/aapt2/ResourceTableResolver.h +++ b/tools/aapt2/ResourceTableResolver.h @@ -24,7 +24,6 @@ #include "ResourceValues.h" #include <androidfw/AssetManager.h> -#include <androidfw/ResourceTypes.h> #include <memory> #include <vector> #include <unordered_set> @@ -40,8 +39,9 @@ public: * Creates a resolver with a local ResourceTable and an AssetManager * loaded with library packages. */ - ResourceTableResolver(std::shared_ptr<const ResourceTable> table, - std::shared_ptr<const android::AssetManager> sources); + ResourceTableResolver( + std::shared_ptr<const ResourceTable> table, + const std::vector<std::shared_ptr<const android::AssetManager>>& sources); ResourceTableResolver(const ResourceTableResolver&) = delete; // Not copyable. @@ -51,8 +51,6 @@ public: virtual Maybe<ResourceName> findName(ResourceId resId) override; - const android::ResTable& getResTable() const; - private: struct CacheEntry { ResourceId id; @@ -62,15 +60,11 @@ private: const CacheEntry* buildCacheEntry(const ResourceName& name); std::shared_ptr<const ResourceTable> mTable; - std::shared_ptr<const android::AssetManager> mSources; + std::vector<std::shared_ptr<const android::AssetManager>> mSources; std::map<ResourceName, CacheEntry> mCache; std::unordered_set<std::u16string> mIncludedPackages; }; -inline const android::ResTable& ResourceTableResolver::getResTable() const { - return mSources->getResources(false); -} - } // namespace aapt #endif // AAPT_RESOURCE_TABLE_RESOLVER_H |