diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-01-22 16:07:42 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-01-23 12:43:42 -0800 |
| commit | 09384303dea4f3f01d5682918d7bab9bf83a02b1 (patch) | |
| tree | 8b1c7e3e736cd8e2fdc0964ea5c71d08536452eb /tools/aapt/AaptAssets.h | |
| parent | 6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff (diff) | |
| download | frameworks_base-09384303dea4f3f01d5682918d7bab9bf83a02b1.zip frameworks_base-09384303dea4f3f01d5682918d7bab9bf83a02b1.tar.gz frameworks_base-09384303dea4f3f01d5682918d7bab9bf83a02b1.tar.bz2 | |
Add support for multiple asset dirs (-A)
Bug: 12608034
Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
Diffstat (limited to 'tools/aapt/AaptAssets.h')
| -rw-r--r-- | tools/aapt/AaptAssets.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h index 5cfa913..9cc9007 100644 --- a/tools/aapt/AaptAssets.h +++ b/tools/aapt/AaptAssets.h @@ -235,7 +235,7 @@ public: const DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> >& getFiles() const { return mFiles; } - status_t addFile(const sp<AaptFile>& file); + status_t addFile(const sp<AaptFile>& file, const bool overwriteDuplicate=false); void removeFile(size_t index); void print(const String8& prefix) const; @@ -301,12 +301,14 @@ private: status_t addDir(const String8& name, const sp<AaptDir>& dir); sp<AaptDir> makeDir(const String8& name); status_t addLeafFile(const String8& leafName, - const sp<AaptFile>& file); + const sp<AaptFile>& file, + const bool overwrite=false); virtual ssize_t slurpFullTree(Bundle* bundle, const String8& srcDir, const AaptGroupEntry& kind, const String8& resType, - sp<FilePathStore>& fullResPaths); + sp<FilePathStore>& fullResPaths, + const bool overwrite=false); String8 mLeaf; String8 mPath; |