diff options
| author | Robert Greenwalt <robdroid@android.com> | 2009-06-09 09:14:20 -0700 |
|---|---|---|
| committer | Robert Greenwalt <robdroid@android.com> | 2009-06-09 16:23:35 -0700 |
| commit | f878e2d80c3a0afefe3b018d232df6066379e1d5 (patch) | |
| tree | 7a5ad87b37729db613202666cea37e525dbd53a3 /tools/aapt/ResourceTable.h | |
| parent | 1e3d1b4b83452286b000b8cd1997e5aef97fe2a7 (diff) | |
Make aapt Error out when an overlay adds a string.
Final added check (I think) for 1585775 - not letting overlays add
resources.
modified: ResourceTable.cpp
modified: ResourceTable.h
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index 20865eacda08..ec4331aa3557 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -418,7 +418,8 @@ public: sp<Entry> getEntry(const String16& entry, const SourcePos& pos, const ResTable_config* config = NULL, - bool doSetIndex = false); + bool doSetIndex = false, + bool overlay = false); const SourcePos& getFirstPublicSourcePos() const { return *mFirstPublicSourcePos; } @@ -502,6 +503,7 @@ private: const String16& type, const String16& name, const SourcePos& pos, + bool overlay, const ResTable_config* config = NULL, bool doSetIndex = false); sp<const Entry> getEntry(uint32_t resID, |