OSDN Git Service

Support dx generating multiple dex files.
authorYohann Roussel <yroussel@google.com>
Tue, 20 Aug 2013 15:05:27 +0000 (17:05 +0200)
committerYohann Roussel <yroussel@google.com>
Wed, 16 Jul 2014 10:38:22 +0000 (12:38 +0200)
commite019dfd721ff1f5d669979d3f66e01421a6bb272
tree6e5587978e45eab1b31d86930ca7be0758005eb3
parent15d00664884b9b8ce4766ab3a7fd15b83cbeaad9
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
core/definitions.mk
core/java.mk