diff options
| author | 2014-02-04 18:31:23 +0000 | |
|---|---|---|
| committer | 2014-02-04 18:31:23 +0000 | |
| commit | 203356a34a82bfc759be02dfa1caa4529dce0732 (patch) | |
| tree | b7fbcede2c4901a2099de6a6a0cae86e8fced51d /tools/aapt/Main.cpp | |
| parent | 6dea46b2e567f614244100f542dce04e44c26bee (diff) | |
| parent | 09384303dea4f3f01d5682918d7bab9bf83a02b1 (diff) | |
Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Diffstat (limited to 'tools/aapt/Main.cpp')
| -rw-r--r-- | tools/aapt/Main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 977226b61471..d1d3deb0106b 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -345,7 +345,7 @@ int main(int argc, char* const argv[]) goto bail; } convertPath(argv[0]); - bundle.setAssetSourceDir(argv[0]); + bundle.addAssetSourceDir(argv[0]); break; case 'G': argc--; |