diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-04 11:00:03 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-02-04 11:00:03 -0800 |
| commit | 94c40a4cf90933216e6d656213dfdfa19c68a9c3 (patch) | |
| tree | 283c3dc05005a538807d59f6896feb051eba991c /tools/aapt/Main.cpp | |
| parent | 2a1fdefe16046860fcaf524af4fc380d850d28bb (diff) | |
| parent | 1b5b60d696dd6840406ab9d3f38522ba18273c60 (diff) | |
resolved conflicts for merge of 1b5b60d6 to master
Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
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 51a12489b285..1ed46308fb30 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -349,7 +349,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--; |