diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-23 14:55:57 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-10-23 14:55:57 -0700 |
| commit | 08d1c808477d67fe9f0a2d2ad9463998f8d54379 (patch) | |
| tree | 7ce4c3a7abc06109a9070c3a2a8401f4f2adaf93 /tools/aapt/AaptAssets.cpp | |
| parent | 41707d01e9e950ebd00642ef3564edcff8c539e7 (diff) | |
| parent | cd8442d4e8f372e6ecd90779f8885798145f5366 (diff) | |
| download | frameworks_base-08d1c808477d67fe9f0a2d2ad9463998f8d54379.zip frameworks_base-08d1c808477d67fe9f0a2d2ad9463998f8d54379.tar.gz frameworks_base-08d1c808477d67fe9f0a2d2ad9463998f8d54379.tar.bz2 | |
Merge commit 'cd8442d4' into manualmerge
Conflicts:
tools/aapt/ResourceIdCache.cpp
Change-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 2849c84..2d35129 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -1140,9 +1140,10 @@ bail: ssize_t AaptAssets::slurpFullTree(Bundle* bundle, const String8& srcDir, const AaptGroupEntry& kind, const String8& resType, - sp<FilePathStore>& fullResPaths) + sp<FilePathStore>& fullResPaths, + const bool overwrite) { - ssize_t res = AaptDir::slurpFullTree(bundle, srcDir, kind, resType, fullResPaths); + ssize_t res = AaptDir::slurpFullTree(bundle, srcDir, kind, resType, fullResPaths, overwrite); if (res > 0) { mGroupEntries.add(kind); } |