summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-13Merge "Promote HWASan tests to presubmit." am: bb7d8dc8d0 am: e70170fd57main-16kFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2093146 Change-Id: I43798609ac63aa39d1379204b3d25f1a344d5ddf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13Merge "Promote HWASan tests to presubmit." am: bb7d8dc8d0Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2093146 Change-Id: Id20eeed92edc000c44f017887e4afe26cd126c80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Merge "Promote HWASan tests to presubmit."Florian Mayer
2022-05-09Promote HWASan tests to presubmit.Florian Mayer
They have been passing and do not show significant slowdown. Change-Id: I7e0a01b7552f20ce2c5871ad306ca18b1a3f679a
2022-04-07Merge "Include algorithm for suffix_array_index.cc" am: ed2a90db11 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devTreehugger Robot
a7051aca58 am: d0d09bada1 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2056640 Change-Id: I990d33dc18ec535d373f5f9d41e5debfebe48419 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "Include algorithm for suffix_array_index.cc" am: ed2a90db11 am: ↵Treehugger Robot
a7051aca58 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2056640 Change-Id: I03b2f0e655f60df5a0dcf7252939cb71f1a0a572 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "Include algorithm for suffix_array_index.cc" am: ed2a90db11Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2056640 Change-Id: I831049f57b38a4a23a8989f2efed6d65f9f8466f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "Include algorithm for suffix_array_index.cc"Treehugger Robot
2022-04-06Include algorithm for suffix_array_index.ccJordan R Abrahams-Whitehead
This is required due to the use of std::mismatch. This file may have compiled before due to a transitive inclusion of the <algorithm> header. However, recent changes to LLVM ToT will prevent these transitive inclusions from happening. We identified this problem due to emerging bsdiff with `llvm-next` in ChromeOS. Bug: 228085014 Test: setup_board --board=amd64-generic \ && repo download -b change-3564896 \ chromiumos/overlays/chromiumos-overlay 3564896 \ && sudo USE='llvm-next -thinlto' emerge \ sys-devel/llvm sys-libs/libcxx \ && sudo emerge bsdiff Change-Id: Ie3af357377c9cf4b51f0d7e1d9758a74605c7b46
2022-03-17Merge "Add bsddiff test to hwasan-postsubmit." am: baf61cd34a am: 81a2ec12e9 ↵Florian Mayer
am: c278edcc40 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2029286 Change-Id: I0be6a3aa9ca0bf7455644c33ecd1715adef975eb
2022-03-17Merge "Add bsddiff test to hwasan-postsubmit." am: baf61cd34a am: 81a2ec12e9Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2029286 Change-Id: I2a5e9010f8cc4ae4dd0ec2cf4163f90e65a8c53f
2022-03-17Merge "Add bsddiff test to hwasan-postsubmit." am: baf61cd34aFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2029286 Change-Id: I6b90d01621796d400f19acf0472246e7ffeacd8e
2022-03-17Merge "Add bsddiff test to hwasan-postsubmit."Florian Mayer
2022-03-17Add bsddiff test to hwasan-postsubmit.Florian Mayer
Change-Id: I78a22fdab469deb72532ae29b2d07771f7999716 Test: Run tests under HWASan. Bug: 193568145
2021-12-22Merge "Make bsdiff available in recovery" am: eeb219b8d2 am: 84ddef2e0f am: ↵Treehugger Robot
0297a3d852 am: 109495f5be Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680 Change-Id: If8c89dfe2c0f9d11ad696a472d31a6bbd707a6ac
2021-12-22Merge "Make bsdiff available in recovery" am: eeb219b8d2 am: 84ddef2e0f am: ↵Treehugger Robot
0297a3d852 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680 Change-Id: I314d2eeb5e7b63b0451d48d4ff0238d8fed89075
2021-12-22Merge "Make bsdiff available in recovery" am: eeb219b8d2 am: 84ddef2e0fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680 Change-Id: I610b904b20162b284162f3433b385681b81931f3
2021-12-22Merge "Make bsdiff available in recovery" am: eeb219b8d2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680 Change-Id: I6357d15a86344ed3cabf960ef137d6c19f0fd9a1
2021-12-22Merge "Make bsdiff available in recovery"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2021-12-21Merge "Add zhangkelvin@ as owner to bsdiff" am: 03442a10c4 am: ee614bda9b ↵Treehugger Robot
am: e9f44d4f51 am: 848a54f546 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930681 Change-Id: I12402c255b2a7465e5bd2a7a577360ff96f71f8c
2021-12-21Merge "Add zhangkelvin@ as owner to bsdiff" am: 03442a10c4 am: ee614bda9b ↵Treehugger Robot
am: e9f44d4f51 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930681 Change-Id: Ic405e8d12a5c4d25dcf21e7fb174dfa4d3a60b0a
2021-12-21Merge "Add zhangkelvin@ as owner to bsdiff" am: 03442a10c4 am: ee614bda9bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930681 Change-Id: I2b7a7b50393e59accbbd409c90f31a57a70a93d0
2021-12-21Merge "Add zhangkelvin@ as owner to bsdiff" am: 03442a10c4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930681 Change-Id: Ie1e7686568107d2e76170fb6dbaae2c5779fae93
2021-12-21Merge "Add zhangkelvin@ as owner to bsdiff"Treehugger Robot
2021-12-20Make bsdiff available in recoveryKelvin Zhang
Change-Id: I9e96d475a52648e885925502be5801926d2764e3
2021-12-20Add zhangkelvin@ as owner to bsdiffKelvin Zhang
Change-Id: Ib9c315009de0adb235fb9b32d416105555aef15e
2021-12-11Merge "Expose file utility classes for consumption" am: b4da837b58 am: ↵Treehugger Robot
f6eecf1513 am: d184d39392 am: bc3803f460 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1917558 Change-Id: I68b9eaf27c09098cc8f601a429684d69f87875dc
2021-12-11Merge "Expose file utility classes for consumption" am: b4da837b58 am: ↵Treehugger Robot
f6eecf1513 am: d184d39392 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1917558 Change-Id: I90ab1c49bc00392152f6e0b0ae371a6b3d7b99d3
2021-12-11Merge "Expose file utility classes for consumption" am: b4da837b58 am: ↵Treehugger Robot
f6eecf1513 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1917558 Change-Id: I3bfeb4a71067872b44984264655b6645b32f3466
2021-12-11Merge "Expose file utility classes for consumption" am: b4da837b58Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1917558 Change-Id: I35f736bdd4bca37e0508ee13d8d002e4c970e649
2021-12-11Merge "Expose file utility classes for consumption"Treehugger Robot
2021-12-09Expose file utility classes for consumptionKelvin Zhang
Tiny utility class for calling bspatch(). Needed so I can call bspatch() without inventing my own versions of MemoryFile and File class. Test: th Change-Id: Ifd6fbae85108ac7b17e5503cb73537e6bec6ad4e
2021-07-24Merge "Expose PatchWriter for consumption" am: c1c7b9eaa7 am: 5ecdc7df3c am: ↵Kelvin Zhang
f7c65e157b am: e6302e4498 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1768592 Change-Id: I54e6b28de9271f979c7a83aaf539d822653fb2df
2021-07-24Merge "Expose PatchWriter for consumption" am: c1c7b9eaa7 am: 5ecdc7df3c am: ↵Kelvin Zhang
f7c65e157b Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1768592 Change-Id: I859e757c054c317cec9dccfb423975b21ab5497b
2021-07-24Merge "Expose PatchWriter for consumption" am: c1c7b9eaa7 am: 5ecdc7df3candroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Kelvin Zhang
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1768592 Change-Id: I0d15c369c10ac628112d2d45329ba0b58bdba9fe
2021-07-24Merge "Expose PatchWriter for consumption" am: c1c7b9eaa7Kelvin Zhang
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1768592 Change-Id: I35e22068ae5979019db8c125d7ca0783398496d5
2021-07-24Merge "Expose PatchWriter for consumption"android-s-beta-5android-s-beta-5Kelvin Zhang
2021-07-15Expose PatchWriter for consumptionKelvin Zhang
Test: th Change-Id: I1d0657bc886967e73b926fae13300bd401696d6a
2021-06-14Merge "Expose patch reader for consumption" am: 952ddd532b am: 7b331f19d9 ↵Treehugger Robot
am: e88872597b am: 4f8b7fb2b3 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865 Change-Id: Ic0fd18ef5e6332b63ee680f032abe6ac4ad736cf
2021-06-14Merge "Expose patch reader for consumption" am: 952ddd532b am: 7b331f19d9 ↵Treehugger Robot
am: e88872597b Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865 Change-Id: I3abeec795a25ec1579d5a19f26b9db94c0579474
2021-06-14Merge "Expose patch reader for consumption" am: 952ddd532b am: 7b331f19d9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865 Change-Id: I13c9586f773e81e4266c2d4635d4c2a4084330ee
2021-06-14Merge "Expose patch reader for consumption" am: 952ddd532bandroid-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865 Change-Id: Ib67be8f7d4375d2a1f5905ab5b7d79ff474cfcd2
2021-06-14Merge "Expose patch reader for consumption"Treehugger Robot
2021-06-14Expose patch reader for consumptionKelvin Zhang
Test: treehugger Change-Id: I032e01c62ca7f188f02c584af20ebb026a5334dd
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ibb5f708aaf8af8375861caff9c955521e20dc85e
2021-05-15Merge "Add comment explaining why we need custom logic to parse int" am: ↵Treehugger Robot
be81a990b3 am: 94af5fff58 am: 30ed9f9151 am: 27b55c2640 am: e0195371e3 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: Ia64b08234a052aa4c3d593c16021c46ccc72677b
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseTreehugger Robot
be81a990b3 am: 94af5fff58 am: 30ed9f9151 am: 27b55c2640 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: Ib560aadd2bac3c23fa15f903132f906db2970281
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵Treehugger Robot
be81a990b3 am: 94af5fff58 am: 30ed9f9151 am: 27b55c2640 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: I95d94b17c7608d054105ba55c53b0484b971f4af
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
be81a990b3 am: 94af5fff58 am: 30ed9f9151 am: 27b55c2640 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: I6f27d6a1271b5913d014b5404668e1239fa3e894
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
be81a990b3 am: 94af5fff58 am: 30ed9f9151 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: If7f10430533b6386582c7a96d9076b79aee762d2