OSDN Git Service

Fix 2 filtering problems in multi dex + main list.
authorYohann Roussel <yroussel@google.com>
Wed, 21 Aug 2013 19:17:24 +0000 (21:17 +0200)
committerBrian Carlstrom <bdc@google.com>
Wed, 28 Aug 2013 23:38:19 +0000 (16:38 -0700)
commit3abdb48fdefcc3136a8d7f9c168a305d9be9690e
tree4a035a5ba5096ee696d10250d410020eadea9402
parent4c656e4ec2f5c5036dc67fb4034c1e7ff7abf343
Fix 2 filtering problems in multi dex + main list.

- Classes in archives were added in all dexes.
- Adding resources could be done twice in non "strictNameCheck" mode
(when using BestEffortMainDexListFilter) if there was 2 secondary
dex.

(cherry picked from commit ad27e19691c6723a801b127f8802f5cdf4f44359)

Change-Id: I5cbc1b273518e868fdd3d642d50488ddcbec2af6
dx/src/com/android/dx/cf/direct/ClassPathOpener.java
dx/src/com/android/dx/command/dexer/Main.java