commit | e019dfd721ff1f5d669979d3f66e01421a6bb272 | [log] [tgz] |
---|---|---|
author | Yohann Roussel <yroussel@google.com> | Tue Aug 20 17:05:27 2013 +0200 |
committer | Yohann Roussel <yroussel@google.com> | Wed Jul 16 12:38:22 2014 +0200 |
tree | 6e5587978e45eab1b31d86930ca7be0758005eb3 | |
parent | 15d00664884b9b8ce4766ab3a7fd15b83cbeaad9 [diff] |
Support dx generating multiple dex files. Dx is now capable of generating multiple dex file in one run. This capability is not compatible with --output=*.dex so this CL changes the --output argument to be a directory. This CL also includes the packaging of the multiple dex files when dx generates more than one dex file. (cherry picked from commit 8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b) Conflicts: core/java.mk Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb