summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in lmp-release history after reset to ↵staging/cm-12.0-cafstaging/cm-12.0The Android Automerger2014-10-210-0/+0
|\ | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-210-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-190-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-160-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-150-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-140-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-130-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-120-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-090-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-080-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-070-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-060-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-050-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-10-010-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-300-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-290-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-280-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-250-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-240-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-230-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-220-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-210-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| |\ | | | | | | | | | fbc139069732673a00885db5365c45951dc1fc71
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| |/| |/|/ | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-180-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-170-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-160-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-150-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-140-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| |\ | | | | | | | | | 7c652e7c7c251bbf105b09f8f4f47196991df32c
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| |/| |/|/ | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-110-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-100-0/+0
|/| | | | | | | d10a49ad6a38478cffe206a8a34c5c54fbc018b9
| * merge in lmp-release history after reset to ↵The Android Automerger2014-09-090-0/+0
| |\ | | | | | | | | | 4de3efd5e674f26b3f45fbb0df9a1772948c8785
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-080-0/+0
| |/| | | | | | | | | | 4de3efd5e674f26b3f45fbb0df9a1772948c8785
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-070-0/+0
| |/| | | | | | | | | | 4de3efd5e674f26b3f45fbb0df9a1772948c8785
| | * merge in lmp-release history after reset to ↵The Android Automerger2014-09-060-0/+0
| | |\ | | |/ | |/| | | | 870b4f2d70d67d6dbb7d0881d101c61bed8caad2
* | | Merge "Bump dx version to 1.10" into lmp-devBenoit Lamarche2014-09-091-1/+1
|\ \ \
| * | | Bump dx version to 1.10Benoit Lamarche2014-09-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This new version should include the following fixes: 8863d0fd24b293032a7e749e89b6f36524e0ff4f (Bug: 16709921) 0ab4f7a318db3635c870ac50b669085312feb567 (Bug: 17438982) (cherry picked from commit 70df3df67bd1076177072110d643c618f51789a2) Change-Id: I986804c02ba807dac5bbfc9a280e0c0f5a684419
* | | Merge "Fixes command line too long error on Windows" into lmp-devBenoit Lamarche2014-09-092-7/+31
|\ \ \
| * | | Fixes command line too long error on WindowsJohn Fazekas2014-09-092-7/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows machines the command line can only accept commands that are 8192 characters or less. This can cause a problem when a project has many dependencies and many libraries are being passed to dex at once. This fixes it by adding a new option to dex called --input-list that can read inputs from a file. This way we only have to pass a single file name instead of a ton of jar files. This keeps the command short so Windows will not complain about it. Bug: 17438982 Signed-off-by: John Fazekas <jfazekas@fd-software.com> (cherry picked from commit 914f2263ca57b21dc4ef1fb218e345a16a5a5db5) Change-Id: I6edd1e7c1d1fddc8d6bf4c4963295d4f4e64032e
* / / Replace == between class constants by ".equals"Benoit Lamarche2014-09-081-2/+2
|/ / | | | | | | | | | | | | | | | | | | This is needed since class constants may not be unique. Indeed, there may be multiple identical class contants in the constant pool. Bug: 16709921 (cherry picked from commit 8863d0fd24b293032a7e749e89b6f36524e0ff4f) Change-Id: I63c07ebf03d67eb942aec6364c7e02c631744612
* / Add libcore src to the dx docs module.Ying Wang2014-09-041-3/+8
|/ | | | | | | | This fixed bogus docs build errors like: dalvik/dx/src/com/android/dx/io/DexIndexPrinter.java:19: error: package com.android.dex does not exist Change-Id: I3217a51c1562194974410c54f936c0713455a93c
* Dalvik is dead, long live Dalvik!Brian Carlstrom2014-08-051754-330457/+0
| | | | | | | | | | | | | | | | | | | | | | | croot cd dalvik repo start dalvik-is-dead-long-live-dalvik . repo sync -c . git rm -r README.txt git rm -r dexopt git rm -r tools/deadcode.py git rm -r tools/dex-preopt git rm -r tools/dexcheck git rm -r tools/gdbjithelper git rm -r unit-tests git rm -r vm git checkout HEAD vm/Common.h (needed by libdex) git checkout HEAD vm/DalvikVersion.h (needed by libdex) git checkout HEAD vm/Profile.h (needed by dmtracedump) git add Android.mk (after removing vm, dexopt, and unit-tests references) git commit -a -m 'Dalvik is dead, long live Dalvik!' Bug: 14298175 Change-Id: I9dd13053677629d13496d4238af4374452cda415
* Do not align 64-bit registers during instruction expansionmikaelpeltier2014-07-292-51/+6
| | | | | | | | | | - The reordering performs during instruction expansion is not correct for all instructions, in particular for xxx/range instructions that require sequential registers. (cherry picked from commit 26a4440a703ed98d19b2b77b4398ad42e8367f5d) Change-Id: Ida3c8a1abfb78a7b119c463b19030572d3fbc40e
* Merge "Do not generate empty dex in multidex." into lmp-devYohann Roussel2014-07-242-2/+5
|\
| * Do not generate empty dex in multidex.Yohann Roussel2014-07-252-2/+5
| | | | | | | | | | | | | | | | | | | | This was possible when the first class considered for adding in a dex was too big to be sure it will fit. Now DX will try to add the class in the current dex and crash if the class causes one index to overflow. (cherry picked from commit f15dafe674d2270cafaf4fb7993963ec474d3761) Change-Id: I323f8111c2be6bace908d0539ff324c4bd033c05
* | Renumber dx test multidex-option-overflow to 128.Yohann Roussel2014-07-233-0/+0
|/ | | | | | | | Because there were 2 tests 123. (cherry picked from commit d3fb68891cffc4e43cff49d46e30d511dc6f1315) Change-Id: Ic6df7590ab32893a40e42ea145d04c64cc265308
* Merge "Fix bad debug info due to 64-bit registers alignment" into lmp-devSebastien Hertz2014-07-175-1/+55
|\
| * Fix bad debug info due to 64-bit registers alignmentmikaelpeltier2014-07-215-1/+55
| | | | | | | | | | | | | | | | | | | | - Registers of LocalStart and LocalSnapshot must also be shift when it is required. Bug: 16344305 (cherry picked from commit 32631e6ee656840701f76e0d736290bfcd4aab7e) Change-Id: Ic437ed4102ad0fbeccc069df0f44cb2d774ff27d