summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵Treehugger Robot
be81a990b3 am: 94af5fff58 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: Id2a7fd04a0e001451ca2cc8a93e9703bb6de184b
2021-04-20Merge "Add comment explaining why we need custom logic to parse int" am: ↵Treehugger Robot
be81a990b3 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1680665 Change-Id: Ie12b010d9c27b95ef7c4825887b55a969a6fee3b
2021-04-20Merge "Add comment explaining why we need custom logic to parse int"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-19Add comment explaining why we need custom logic to parse intKelvin Zhang
Test: no need Change-Id: I71df7c09b260881b8753b77b6950ce97740d3191
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9a8f19b42f -s ↵Xin Li
ours am: a58c233bef -s ours am skip reason: Change-Id Ia27fe379f85ce15f318600e942374bd545149a79 with SHA-1 eaa3b002c5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia62868b72c9784d83f876cf4e28f9d31e38eb4b2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9a8f19b42f -s oursXin Li
am skip reason: Change-Id Ia27fe379f85ce15f318600e942374bd545149a79 with SHA-1 eaa3b002c5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1bfc59302edf66e2fec6af7040bf37f906a6fe4
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ia27fe379f85ce15f318600e942374bd545149a79 Change-Id: I083327560b708ec7a5040c364674895b9a89aba4
2021-02-09Merge "Update bsdiff_unittest to really work host-side" am: f5034d49ab am: ↵Treehugger Robot
71a32643dd am: d7d33cf02e Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17ad7a00d31e40f891aeee54ded1fbf96602b557
2021-02-09Merge "Update bsdiff_unittest to really work host-side" am: f5034d49ab am: ↵Treehugger Robot
71a32643dd Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c43ac9e80263c593cd4a50066a79d8adb376550
2021-02-09Merge "Update bsdiff_unittest to really work host-side" am: f5034d49abTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1579929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba15bd538b79044711476c0fa5bbd86e9867b68a
2021-02-09Merge "Update bsdiff_unittest to really work host-side"android-s-preview-1Treehugger Robot
2021-02-07Update bsdiff_unittest to really work host-sideJulien Desprez
bsdiff_unittest is marked host_supported:true but use a AndroidTest.xml config that can only work for device. Deleting the explict config to rely on the auto-gen ones. Adding unit_tests:true to run in presubmit Change-Id: Ia3a23149ccdc2efa2c880436e30fcff4acf9ddd9 Test: presubmit, atest bsdiff_unittest --host Bug: 179092189
2021-01-22Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff" am: 0ca54eb3de am: ↵Bob Badour
dfadd2beae am: bc30369080 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1557829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic06c5431c236d31a69717e3f5f0d3b5268b6b32f
2021-01-22Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff" am: 0ca54eb3de am: dfadd2beaeBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1557829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a766a1086b81d4682c08433f5716b2170f881d3
2021-01-22Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff" am: 0ca54eb3deBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1557829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie60918356bb8c19c81f9b76a50097eb70708ae9b
2021-01-22Merge "Add LOCAL_LICENSE_KINDS to external/bsdiff"Bob Badour
2021-01-21Add LOCAL_LICENSE_KINDS to external/bsdiffBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic407d90ef0cf787a41786d3775653c5a1e831df8
2020-11-24Mark ab/6881855 as merged am: 0009ac8eed am: eaa3b002c5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/13112088 Change-Id: I7b6fcb8134c04a032218ca4e010829a20dc30102
2020-11-24Mark ab/6881855 as merged am: 0009ac8eedXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/13112088 Change-Id: Ia27fe379f85ce15f318600e942374bd545149a79
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I2777ee69400ad127728937b608d8f70c220c7ddc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e4ccac5919 -s ours am: ↵Xin Li
d1377d4a33 -s ours am: cbb1e7334a -s ours am skip reason: Change-Id If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580 with SHA-1 d2f5901ceb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12797255 Change-Id: I62a23a7d8b5680c4af1bbb44cc8031e273def73b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e4ccac5919 -s ours am: ↵Xin Li
d1377d4a33 -s ours am skip reason: Change-Id If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580 with SHA-1 d2f5901ceb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12797255 Change-Id: I8d089b6472194a35125f8fc30287b94e34e0c5c8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e4ccac5919 -s oursXin Li
am skip reason: Change-Id If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580 with SHA-1 d2f5901ceb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12797255 Change-Id: I8f230a7ff113a2dc7f448c8697581569db59f571
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580 Change-Id: Iccbffdc01711bbea1221ac26b406ba1c474e5d0b
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 81735a7ca5 -s ours am: ec6123be72 -s ours am: 612edf0044 -s ours am: aa566c51aa -s ours am skip reason: Change-Id I8016529dfaf6109d2a7b092de18b78c50131b959 with SHA-1 cb25028daa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12469866 Change-Id: I59a29750176f4415f0bed1227789799103466634
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 81735a7ca5 -s ours am: ec6123be72 -s ours am: 612edf0044 -s ours am skip reason: Change-Id I8016529dfaf6109d2a7b092de18b78c50131b959 with SHA-1 cb25028daa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12469866 Change-Id: I774a9a6ad592119d3c34c8fe7e9fc3d64a9ca80b
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 81735a7ca5 -s ours am: ec6123be72 -s ours am skip reason: Change-Id I8016529dfaf6109d2a7b092de18b78c50131b959 with SHA-1 cb25028daa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12469866 Change-Id: I0c08ad1613eee09d20775d8aacf8dd40254ae60a
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 81735a7ca5 -s ours am skip reason: Change-Id I8016529dfaf6109d2a7b092de18b78c50131b959 with SHA-1 cb25028daa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bsdiff/+/12469866 Change-Id: I3fc78ccc312bcf26587f588f13f123692c617519
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I8016529dfaf6109d2a7b092de18b78c50131b959 Change-Id: I3f2a33c2f04d41f16c8a0ace70cbb2d6d38a4640
2020-08-20Merge "Allow libsnapshot to link to bsdiff." am: 0ed284a7e0 am: a6356c579a ↵David Anderson
am: 15b9e810e3 am: 28ae6ec3e7 am: 595dd0a1ff Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1392522 Change-Id: I6776773e1c62812979ee5255fab655a958e194b1
2020-08-20Merge "Allow libsnapshot to link to bsdiff." am: 0ed284a7e0 am: a6356c579a ↵David Anderson
am: 15b9e810e3 am: 28ae6ec3e7 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1392522 Change-Id: I1d5ec876e2e3a68aa9ba799a37c24c325371eb30
2020-08-20Merge "Allow libsnapshot to link to bsdiff." am: 0ed284a7e0 am: a6356c579a ↵David Anderson
am: 15b9e810e3 Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1392522 Change-Id: I90124972b29daf7175b247ad1e583ae5580fe926
2020-08-20Merge "Allow libsnapshot to link to bsdiff." am: 0ed284a7e0 am: a6356c579aDavid Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1392522 Change-Id: Ic88e5aa6762ee5831acbae865cc3659484b15dcc
2020-08-19Merge "Allow libsnapshot to link to bsdiff." am: 0ed284a7e0David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1392522 Change-Id: I59a3a08b96f0f35967edd6f588a7b4a9f7bb4027
2020-08-19Merge "Allow libsnapshot to link to bsdiff."David Anderson
2020-08-05Allow libsnapshot to link to bsdiff.David Anderson
Bug: 1378463 Test: m vab_convert_payload Change-Id: I8f36ba5bc9b054c2626abf3ed475864f34d40d25
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a am: ↵Treehugger Robot
c62b211329 am: cb25028daa am: d2f5901ceb am: 760be28e2d Change-Id: I46bdadc3fb9d097b061a51e54a4dcbe66fafd018
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a am: ↵Treehugger Robot
c62b211329 am: cb25028daa am: d2f5901ceb Change-Id: Ie4868bae28a932eee09594bc28fc61e9e70ecb2a
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a am: ↵Treehugger Robot
c62b211329 am: cb25028daa Change-Id: If1b1b5fdcc1d5d9e97a708a9e9ef4d45d36d5580
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a am: c62b211329Treehugger Robot
Change-Id: I8016529dfaf6109d2a7b092de18b78c50131b959
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8aandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I548cc564cbc6fbc10fad6e3c53c80af372a19a3b
2020-04-29Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to bsdiff: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I880d892a5a38d0c2782d0fa0ef57f43649318327
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9f95b3ec5d -s ours am: 2b4a7eee21 am: 31d2e01665 am: 03703bd2ae -s ours am skip reason: subject contains skip directive Change-Id: Iccc4a471c97fd4af18a8070476464a2a6f34d29f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9f95b3ec5d -s ours am: 2b4a7eee21 am: 31d2e01665 Change-Id: Ife0ae72ba79d52e0d92cbe7dfa561b9c2dbc0197
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9f95b3ec5d -s ours am: 2b4a7eee21 Change-Id: I9655146acc302f450218edd2fe471b820781a1b0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9f95b3ec5d -s ours am skip reason: subject contains skip directive Change-Id: Ia8bde32398161379b8584b7afcf6be02a6dff520
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I597d1a186f708c3990a4babfd3c259c94b8f051e
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 090c86526c am: 5f8e9aa537 ↵Treehugger Robot
am: d3c484cb02 am: 4e286173b1 am: 93c46e544e Change-Id: Ifd306c1298ddca07acdca4988a4c836bfc3754a9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 21:39:05 +0000