summaryrefslogtreecommitdiffstats
path: root/dx
Commit message (Expand)AuthorAgeFilesLines
* Fixes unnecessary multi-merge steps.Esteban de la Canal2015-10-138-157/+163
* 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
| * | 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 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
* | | | | 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
| * | | | 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
| | |/ /
| * | | 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
| | |/ /
| * / / Don't discard directory entries in jar files.Narayan Kamath2015-04-071-17/+17
| |/ /
| * | Descriptor references are direct referencesYohann Roussel2015-04-071-14/+30
| * | Allow to disable forced keep of annotatedYohann Roussel2015-03-223-8/+53
| |/
| * Keep annotated classes in main dex listYohann Roussel2014-12-0111-202/+410
* | Merge "Descriptor references are direct references"Yohann Roussel2015-04-071-14/+30
|\ \
| * | Descriptor references are direct referencesYohann Roussel2015-03-171-14/+30
* | | Fix potential dex index overflow in dxPeter Jensen2015-03-272-6/+7
* | | Bump dx version to 1.11Benoit Lamarche2015-03-181-1/+1
* | | am 366e2045: Merge "Support --num-threads with --multi-dex (take 2)"Benoit Lamarche2015-02-1016-135/+662
|\| |
| * | Support --num-threads with --multi-dex (take 2)Peter Jensen2015-02-0916-135/+662
* | | am b3ef71c0: Merge "Revert "Support --num-threads with --multi-dex""Benoit Lamarche2015-02-1016-656/+134
|\| |
| * | Merge "Revert "Support --num-threads with --multi-dex""Benoit Lamarche2015-02-0916-656/+134
| |\ \
| | * | Revert "Support --num-threads with --multi-dex"Benoit Lamarche2015-02-0916-656/+134
* | | | am 6e28e432: Merge "Support --num-threads with --multi-dex"Benoit Lamarche2015-02-1016-134/+656
|\| | |
| * | | Merge "Support --num-threads with --multi-dex"Benoit Lamarche2015-02-0916-134/+656
| |\| |
| | * | Support --num-threads with --multi-dexPeter Jensen2014-12-2216-134/+656
* | | | am 38246b3b: Merge "Don\'t discard directory entries in jar files."Narayan Kamath2015-01-261-17/+17
|\| | |
| * | | Don't discard directory entries in jar files.Narayan Kamath2015-01-231-17/+17
* | | | am c0221e7e: Merge "Allow to disable forced keep of annotated"Yohann Roussel2015-01-083-8/+53
|\| | |
| * | | Allow to disable forced keep of annotatedYohann Roussel2015-01-083-8/+53
| |/ /
* | | am e2808cf4: Merge "Do not keep the DexFile field in Main between runs"Benoit Lamarche2014-12-191-6/+11
|\| |
| * | Do not keep the DexFile field in Main between runsBenoit Lamarche2014-12-171-6/+11
* | | am c9548518: Merge "Keep annotated classes in main dex list"Yohann Roussel2014-11-2811-202/+410
|\| |
| * | Merge "Keep annotated classes in main dex list"Yohann Roussel2014-11-2811-202/+410
| |\ \
| | * | Keep annotated classes in main dex listYohann Roussel2014-11-2611-202/+410
| * | | Keep --input-list order.Xavier Ducrohet2014-11-141-6/+7
| |/ /
* | | am 97479500: Keep --input-list order.Xavier Ducrohet2014-11-151-6/+7
|\ \ \ | | |/ | |/|
| * | Keep --input-list order.Xavier Ducrohet2014-11-131-6/+7
* | | am b929a279: am a1e4327e: Merge "Command line option for disabling warnings"Benoit Lamarche2014-11-063-2/+25
|\ \ \ | | |/ | |/|
| * | am a1e4327e: Merge "Command line option for disabling warnings"Benoit Lamarche2014-11-063-2/+25
| |\ \
| | * | Command line option for disabling warningsCsaba Kozák2014-11-063-2/+25
* | | | am 315b53e9: Add +x on mainDexClasses.Xavier Ducrohet2014-11-011-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add +x on mainDexClasses.Xavier Ducrohet2014-10-311-0/+0
| * | Merge "Bump dx version to 1.10" into lmp-devBenoit Lamarche2014-09-091-1/+1
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 09:11:43 +0000