summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | am 0661627c: am 51deeeae: Merge "Remove references to the simulator."Elliott Hughes2015-03-201-121/+0
| | |\ \ \ \
| | * \ \ \ \ am a1e7a2bb: am c4168d85: Merge "Update ziparchive usage to the new API."Piotr Jastrzebski2015-03-201-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ am 714f5c53: am 870b4f2d: Dalvik is dead, long live Dalvik!Brian Carlstrom2015-03-200-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am b19ed0d9: am fb5b0d5b: Merge "Do not align 64-bit registers during instruc...mikaelpeltier2015-03-200-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 2cd296ba: am 76e15e36: Do not align 64-bit registers during instruction ex...mikaelpeltier2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am c497f502: am 878445a7: Merge "Do not generate empty dex in multidex." into...Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 6b6be06f: am df00ef7c: Renumber dx test multidex-option-overflow to 128.Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 78b23481: am fdff485b: Merge "Fix dx test 127-merge-stress"Benoit Lamarche2015-03-201-2/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 218161db: am df370780: Merge "Fix bad debug info due to 64-bit registers a...Sebastien Hertz2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 3a64769b: am ba9704d4: Merge "Remove LocalEnd since it is not used" into l...Sebastien Hertz2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am f58cf778: am 61568557: Rename openDexFileNative to openDexFile.Calin Juravle2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e4cfe79: am 6b417ac6: Merge "Do not generate empty dex in multidex."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a5d72b7a: am 312a17b0: Merge "Renumber dx test multidex-option-overflow to...Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ed4c3e41: am d09fa663: Merge "Bump version to 1.9."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 982598a0: am 65d51775: Merge "Make a better detection of index limit in mu...Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fe7853cb: am f66091f0: Merge "Keep all annotation in main dex."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 92352303: am 2fda5f4a: Merge "Fix detection of main dex overflow in multidex"Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f2bde79e: am 513109c0: (-s ours) Merge "Fix mainDexClasses with obfuscation."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 535b3563: am 69becf7f: Merge "Improve the new ClassReferenceListBuilder API."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f37c3048: am e2481f90: (-s ours) Merge "Fix public API of ClassReferenceLi...Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 401b5e46: am 2fb03f4d: (-s ours) Merge "Add public API to ClassReferenceLi...Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1df1186f: am a7a07a78: Merge "Add DexMerge stress test"Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 54404adb: am 79e08820: Merge "Add tests about dx multidex options."Yohann Roussel2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ea359361: am 9fccd161: Merge "Fix bad debug info due to 64-bit registers a...mikaelpeltier2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b98bf31e: am a80b45c8: Merge "Remove LocalEnd since it is not used"mikaelpeltier2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49d0ef31: am 413f5b2f: Switch defaults of dlmalloc/jemalloc.Christopher Ferris2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7ff95cda: am 8cd32877: am 2c243a10: am 388f055a: am 46cf2623: Merge "Align...Ian Rogers2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bffba9c8: am 90eb0c6c: am 388f055a: am 46cf2623: Merge "Align 64-bit regis...Ian Rogers2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8205cac0: Merge "Bump dx version to 1.11"Benoit Lamarche2015-03-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Bump dx version to 1.11"Benoit Lamarche2015-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump dx version to 1.11Benoit Lamarche2015-03-181-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0ae30250: am 366e2045: Merge "Support --num-threads with --multi-dex (take...Benoit Lamarche2015-02-1116-135/+662
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 366e2045: Merge "Support --num-threads with --multi-dex (take 2)"Benoit Lamarche2015-02-1016-135/+662
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 c9863702: am b3ef71c0: Merge "Revert "Support --num-threads with --multi-d...Benoit Lamarche2015-02-1116-656/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 6a9b8b7f: am 6e28e432: Merge "Support --num-threads with --multi-dex"Benoit Lamarche2015-02-1116-134/+656
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 12a6e13a: am 438b9164: Merge "Removing dalvik/hit, replaced by tools/base/...Brian Carlstrom2015-02-0217-2477/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 438b9164: Merge "Removing dalvik/hit, replaced by tools/base/perflib"Brian Carlstrom2015-02-0117-2477/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Removing dalvik/hit, replaced by tools/base/perflib"Brian Carlstrom2015-02-0117-2477/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing dalvik/hit, replaced by tools/base/perflibBrian Carlstrom2015-01-2917-2477/+0
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f6bc28f0: am 38246b3b: Merge "Don\'t discard directory entries in jar files."Narayan Kamath2015-01-261-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 38246b3b: Merge "Don\'t discard directory entries in jar files."Narayan Kamath2015-01-261-17/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't discard directory entries in jar files."Narayan Kamath2015-01-261-17/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \