summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADHEADreplicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Jessica Wagantall2016-07-071-5/+5
|\
| * Fix potential buffer overrun.Aart Bik2016-05-271-5/+5
* | dexdeps: Ignore static initializers on analysis.Adnan Begovic2016-03-041-4/+8
* | dexdeps: Add option for --include-cm-classes.Adnan Begovic2016-03-032-4/+15
|/
* Fixes unnecessary multi-merge steps.Esteban de la Canal2015-10-148-157/+163
* am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1...Yohann Roussel2015-08-211-1/+2
|\
| * am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-devYohann Roussel2015-08-211-1/+2
| |\
| | * resolved conflicts for merge of ab01c96b to lmp-mr1-devYohann Roussel2015-08-211-1/+2
| | |\
| | | * Ensure deterministic multidex partitioningYohann Roussel2015-08-191-1/+2
* | | | Add a libbase dependency for dexdump/dexlist.Narayan Kamath2015-06-042-9/+12
* | | | Remove libdexdump_static.Narayan Kamath2015-05-011-11/+0
* | | | am b8a003c7: am 010ac971: Merge "Bump dx version to 1.11" into lmp-mr1-devBenoit Lamarche2015-04-080-0/+0
|\ \ \ \ | |/ / /
| * | | am 010ac971: Merge "Bump dx version to 1.11" into lmp-mr1-devBenoit Lamarche2015-04-080-0/+0
| |\ \ \ | | |/ /
| | * | Merge "Bump dx version to 1.11" into lmp-mr1-devBenoit Lamarche2015-04-081-1/+1
| | |\ \
| | | * | Bump dx version to 1.11Benoit Lamarche2015-04-071-1/+1
* | | | | am 1d40d9ea: am 7b153a1d: Merge "Fix potential dex index overflow in dx" into...Benoit Lamarche2015-04-081-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 7b153a1d: Merge "Fix potential dex index overflow in dx" into lmp-mr1-devBenoit Lamarche2015-04-081-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix potential dex index overflow in dx" into lmp-mr1-devBenoit Lamarche2015-04-082-6/+7
| | |\ \ \
| | | * | | Fix potential dex index overflow in dxPeter Jensen2015-04-072-6/+7
* | | | | | am 00d77c91: resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aospBenoit Lamarche2015-04-081-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aospBenoit Lamarche2015-04-081-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Support --num-threads with --multi-dex (take 2)" into lmp-mr1-devBenoit Lamarche2015-04-0816-135/+662
| | |\ \ \ \ | | | |/ / /
| | | * | | Support --num-threads with --multi-dex (take 2)Peter Jensen2015-04-0716-135/+662
* | | | | | am a6bf3001: resolved conflicts for merge of ab1774c0 to lmp-mr1-dev-plus-aospBenoit Lamarche2015-04-070-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of ab1774c0 to lmp-mr1-dev-plus-aospBenoit Lamarche2015-04-070-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not keep the DexFile field in Main between runs" into lmp-mr1-devBenoit Lamarche2015-04-071-6/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | Do not keep the DexFile field in Main between runsBenoit Lamarche2015-04-071-6/+11
| | | |/ /
* | | | | am 5ff9033e: am f052d52e: Merge "Command line option for disabling warnings" ...Benoit Lamarche2015-04-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am f052d52e: Merge "Command line option for disabling warnings" into lmp-mr1-devBenoit Lamarche2015-04-070-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Command line option for disabling warnings" into lmp-mr1-devBenoit Lamarche2015-04-073-2/+25
| | |\ \ \
| | | * | | Command line option for disabling warningsCsaba Kozák2015-04-073-2/+25
| | | |/ /
* | | | | am ae1d7c49: am 90fcf359: Don\'t discard directory entries in jar files.Narayan Kamath2015-04-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 90fcf359: Don\'t discard directory entries in jar files.Narayan Kamath2015-04-070-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Don't discard directory entries in jar files.Narayan Kamath2015-04-071-17/+17
| | |/ /
* | | | am 65c602a4: am 008da7d4: Descriptor references are direct referencesYohann Roussel2015-04-070-0/+0
|\ \ \ \ | |/ / /
| * | | am 008da7d4: Descriptor references are direct referencesYohann Roussel2015-04-070-0/+0
| |\ \ \ | | |/ /
| | * | Descriptor references are direct referencesYohann Roussel2015-04-071-14/+30
* | | | am 2d13966c: am cc367043: Merge "Descriptor references are direct references"Yohann Roussel2015-04-071-14/+30
|\ \ \ \ | |/ / /
| * | | am cc367043: Merge "Descriptor references are direct references"Yohann Roussel2015-04-071-14/+30
| |\ \ \
| | * \ \ Merge "Descriptor references are direct references"Yohann Roussel2015-04-071-14/+30
| | |\ \ \
| | | * | | Descriptor references are direct referencesYohann Roussel2015-03-171-14/+30
* | | | | | am 14d81e14: am 45e4d877: Allow to disable forced keep of annotatedYohann Roussel2015-04-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 45e4d877: Allow to disable forced keep of annotatedYohann Roussel2015-04-030-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Allow to disable forced keep of annotatedYohann Roussel2015-03-223-8/+53
* | | | | am 931b89b5: Merge "Fix potential dex index overflow in dx"Benoit Lamarche2015-03-272-6/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix potential dex index overflow in dx"Benoit Lamarche2015-03-272-6/+7
| |\ \ \ \
| | * | | | Fix potential dex index overflow in dxPeter Jensen2015-03-272-6/+7
| |/ / / /
* | | | | am 72a4be69: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ \
| * \ \ \ \ reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-210-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | reset to 8205cac with history.Qiwen Zhao2015-03-200-0/+0
| | |\ \ \ \ | |/ / / / /