diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-04 18:36:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-04 18:36:10 +0000 |
| commit | 1b5b60d696dd6840406ab9d3f38522ba18273c60 (patch) | |
| tree | 1c6896b824a4f9bcf2b8960048f53d4713929d70 /tools/aapt/Main.cpp | |
| parent | 1441acdd6d0f08b00493478386e1b74df47e243b (diff) | |
| parent | 203356a34a82bfc759be02dfa1caa4529dce0732 (diff) | |
am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
Add support for multiple asset dirs (-A)
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--; |