diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-05 12:30:25 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-05 12:30:25 -0800 |
| commit | 685d363d7a3e8833edc9368a3c59b69755e0ba29 (patch) | |
| tree | e04662b84ae8cc05665206336a148928c23b7cab /tools/aapt/ResourceTable.h | |
| parent | b3d260222fd003c8b537bb9f86625a200bd0f999 (diff) | |
| parent | fb96e54ba8d43a9f3162c92760e53ab61c7486ff (diff) | |
| download | frameworks_base-685d363d7a3e8833edc9368a3c59b69755e0ba29.zip frameworks_base-685d363d7a3e8833edc9368a3c59b69755e0ba29.tar.gz frameworks_base-685d363d7a3e8833edc9368a3c59b69755e0ba29.tar.bz2 | |
Merge commit 'fb96e54' into manualmerge
Conflicts:
tools/aapt/Resource.cpp
Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index eac5dd3..db392c8 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -7,15 +7,16 @@ #ifndef RESOURCE_TABLE_H #define RESOURCE_TABLE_H -#include "ConfigDescription.h" -#include "StringPool.h" -#include "SourcePos.h" -#include "ResourceFilter.h" - #include <map> #include <queue> #include <set> +#include "ConfigDescription.h" +#include "ResourceFilter.h" +#include "SourcePos.h" +#include "StringPool.h" +#include "Symbol.h" + using namespace std; class XMLNode; @@ -543,6 +544,8 @@ public: DefaultKeyedVector<String16, uint32_t> mKeyStringsMapping; }; + void getDensityVaryingResources(KeyedVector<Symbol, Vector<SymbolDefinition> >& resources); + private: void writePublicDefinitions(const String16& package, FILE* fp, bool pub); sp<Package> getPackage(const String16& package); |