summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-03merge in nyc-release history after reset to nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-cts-releasenougat-bugfix-releaseThe Android Automerger
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵nougat-devAart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 am: 63e01f731f am: a0af385aae am: f984fa7d59 am: c423f55f64 * commit 'c423f55f64f430d0e56a1809db49129f03760230': Fix potential buffer overrun. Change-Id: I09a8473dcbd22482cdc8015538e82d0a33d86dac
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 am: 63e01f731f am: a0af385aae am: f984fa7d59 * commit 'f984fa7d59f680eabb13920aa2b4dd2cbfc8be68': Fix potential buffer overrun. Change-Id: I6c172e5a2e5b1f236b61351d92dc98357a22b892
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 am: 63e01f731f am: a0af385aae * commit 'a0af385aae066ee3e3b5414b4dbeb5acb03b3e9e': Fix potential buffer overrun. Change-Id: Ic52a3476c569227eb2146b4ac653fb8a3f58e068
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 am: 63e01f731f * commit '63e01f731fcf4e7b14ed3fb864bbbdc49cc18f2a': Fix potential buffer overrun. Change-Id: I9da77753de3597886bd2aa9443f1e0f49962920d
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 * commit '3bbe8817e6dbfcb64ea7a02fa46be533ce5718ab': Fix potential buffer overrun. Change-Id: I4b76d9d081fe87c207fc1a6f4832e3af969d7816
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 * commit '46464a20e0f4f5ec22e1ca9c5fb9d7f603295f5c': Fix potential buffer overrun. Change-Id: I180bcd9b425711745406725a2906f4854b7f3706
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 ↵Aart Bik
am: 8e37aa191f am: e5c4e849e2 * commit 'e5c4e849e23721e90d4a42038925ae8484f5c850': Fix potential buffer overrun. Change-Id: Icdcdd512ce2cde9b7a317dcd948cb2539e03f8d6
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496Aart Bik
am: 8e37aa191f * commit '8e37aa191ff8c9099efa24800048c08afe0b53cf': Fix potential buffer overrun. Change-Id: I30bc81276880e8816387a6b3d242015988a2b305
2016-05-02Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6Aart Bik
am: 0e17e18496 * commit '0e17e1849633b07c019daf89c0d2ededc1333f3b': Fix potential buffer overrun. Change-Id: I2d0f7e326f21fd0fd2e8f03b2c7eda302730f4f9
2016-05-02Fix potential buffer overrun. am: 38025bc7faAart Bik
am: 805b415be6 * commit '805b415be62243e6c30dcfbcf8c6fc39f32a469f': Fix potential buffer overrun. Change-Id: I5c6959756d219ddcdb200318869d781bc3d99e93
2016-05-02Fix potential buffer overrun.Aart Bik
am: 38025bc7fa * commit '38025bc7fa31b231ae7b1575e0faf62a7f0953cf': Fix potential buffer overrun. Change-Id: I60b170a299f5c1f35e233ef41db528981453f40b
2016-04-29Fix infamous 0d0a bug on Windows by not opening file binary.Aart Bik
Rationale: On Windows, writing out 0a really writes out 0d0a in text mode. Thus, the file should be opened in binary. On Linux, this is a nop (in fact O_BINARY does not exist). BUG=28385192 (cherry picked from commit 21a1b4488ba22eaabea941741c455cd6aa44b782) Change-Id: I906c610fdb2f43b1ef95eff2533a06af85de0850
2016-04-22Fix potential buffer overrun.Aart Bik
BUG=27840771 Change-Id: I240f188b2e8f4b45d90138cfb3b14869cf506452
2016-04-20merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-19Potential buffer overflow fix in libdex.Aart Bik
BUG=27840771 Change-Id: I56442c376036372b005548d3e6a4060647639055
2016-04-17merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-15Fix Dexdeps to accept dex version 037Nicholas Sauer
Minor renaming and comments for clarity. bug:28210069 Change-Id: I7bc24e5bfa708df5156e30f2e93528d70de30069
2016-04-04merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-04merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-04-03merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-31Support dex 37 for DexMergerAlex Light
Make DexMerger take the largest dex-file version that is given. Bug: 27538761 Bug: 27809626 (cherry picked from commit 3e7edcb6e2277e7311a2daaacebb0fa87b453d6f) Change-Id: Iddca99477f5edbfc7b9cf3b3deda37fd84e4eeda
2016-03-30merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-29Add support for dex version 37 in libdex.Alex Light
Bug: 27538761 Bug: 27809626 (cherry picked from commit 5c391cc69978326b08f303e37951b6924038520c) Change-Id: I79b2bdfc8194dc210bc1299b0544f82b2af735b0
2016-03-06merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-03-03fix DexMerger's estimate for the merged classData sectionKevin Bierhoff
the new estimated growth factor of 1.67 is derived as follows: - classData section contains fields and methods - for each method, 3 ulebs are written, but one of them (modifiers) doesn't change as a result of merging - for each field, 2 ulebs are written, but one can again not change - thus in the worst case, the section only contains methods and every 2/3 ulebs can grow (cherry picked from commit 89c573adfb3e9075b373e7ca324700e13971e918) Bug: 27368018 Change-Id: I1dddc419592c8cd39d98c703840316d0ab65120c
2016-02-24merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-02-23Merge "Consider declared member descriptors as direct ref" into nyc-devYohann Roussel
2016-02-23Consider declared member descriptors as direct refYohann Roussel
Declared method and field descriptors elements are direct references and those direct references must be considered directly because their only corresponding constant pool entry is a CONSTANT_Utf8_info. Bug: 27158750 (cherry picked from commit 39ac62be7b97b4504b89acdb85f9cfc515d222ad) Change-Id: I8597440f2a3044c2e893ff8488977b82d15c7b2d
2016-02-23merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-02-22Merge "Bump dx version to 1.12" into nyc-devBenoit Lamarche
2016-02-22Bump dx version to 1.12Benoit Lamarche
(cherry picked from commit ea805da903a9055512e15a51aa4b93285cd994f2) Change-Id: I2f7e58e88218c0669b9199feeeca21200e4cb6b4
2016-02-22Improve dx error handlingLiam Miller-Cushon
If a class file cannot be parsed, print the error message and context (including file name), and omit the stack trace unless --debug is enabled. Bug: 25075831 (cherry picked from commit bd156605a787bbbb5524b6b25254b37a67e6dd7f) Change-Id: I1615591e6c389e2c99bbc024da22a59abe62a3a2
2016-02-07merge in nyc-release history after reset to masterThe Android Automerger
2016-02-05Merge "Add better error message for unsupported classfile"Delphine Martin
am: d317cc3a99 * commit 'd317cc3a99cf4a943877d0e0f22781829e4edd8f': Add better error message for unsupported classfile
2016-02-05Merge "Add better error message for unsupported classfile"Delphine Martin
2016-02-05Add better error message for unsupported classfileDelphine Martin
- There are now 2 differents messages for bad magic number and unsupported version - The version number is printed in decimal instead of hexadecimal. Bug: 25075831 Change-Id: I37227c65779c432d6d699a27c54d97766f8ff550
2016-02-02merge in nyc-release history after reset to masterThe Android Automerger
2016-02-02merge in nyc-release history after reset to masterThe Android Automerger
2016-01-28Merge "Consider direct references in interface methods"Yohann Roussel
am: ea4bfa0008 * commit 'ea4bfa000802809bb63f7534d3b44afb70391bb8': Consider direct references in interface methods
2016-01-28Merge "Consider direct references in interface methods"Yohann Roussel
2016-01-28Consider direct references in interface methodsYohann Roussel
Previously ClassReferenceListBuilder was considering only CstMethodRef and ignoring CstInterfaceMethodRef. Bug: 26823834 Change-Id: I5f016feb7ba91c9ab6abcd9edd9ecd7a27aa3ef9
2015-11-07Merge "DX: Fix tests 115, 119, 125" am: 50b3c25ccfAndreas Gampe
am: 47d5a85f8b * commit '47d5a85f8b82542e3f1ce4ee29c48ec17d70589f': DX: Fix tests 115, 119, 125
2015-11-07Merge "DX: Fix tests 029, 033, 116, 117" am: 474556575eAndreas Gampe
am: a16d31787a * commit 'a16d31787a6413d3c637ea29903a2ff53214d3f4': DX: Fix tests 029, 033, 116, 117
2015-11-07Merge "DX: Fix tests 115, 119, 125"Andreas Gampe
am: 50b3c25ccf * commit '50b3c25ccfd2f11bd1fe4039a3539798630fb40c': DX: Fix tests 115, 119, 125
2015-11-07Merge "DX: Fix tests 029, 033, 116, 117"Andreas Gampe
am: 474556575e * commit '474556575e9c0ac0cc1a63a4ea1751c9db4b93d1': DX: Fix tests 029, 033, 116, 117
2015-11-07Merge "DX: Fix tests 115, 119, 125"Andreas Gampe
2015-11-07Merge "DX: Fix tests 029, 033, 116, 117"Andreas Gampe
2015-11-06DX: Fix tests 029, 033, 116, 117Andreas Gampe
Fix the junit tests. Bug: 25567784 Change-Id: I17df7644b938c55a7a6b0fd39be535c59b71b0f7
2015-11-06DX: Fix tests 115, 119, 125Andreas Gampe
These tests run a runtime. Move them to ART. Also update 115 and 119 for junit changes. Bug: 25567784 Change-Id: I45ed0f70d979437ae8a94bf1b7f164dd9bb46da7