aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872 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-releaseJulien Desprez
97943f63ee am: 625237135f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I5ce7f73167bdf88b777b6dd3f7e1871cc88eeaf9
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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_r12android-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-devandroid12L-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-releaseandroid12-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-devandroid-s-v2-preview-1Julien Desprez
97943f63ee Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I1027cae43e57252632e1da9e538ebd775216bcff
2021-03-25alarm_test already runs in presubmit am: 670b0afded am: 3fa0f2b872Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: Iaa572b466ff7b526e13b9e68d199416a92c2693b
2021-03-25alarm_test already runs in presubmit am: 670b0afdedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1653127 Change-Id: I86dbb3626c24398d4753b2744318a7009a3bad53
2021-03-24alarm_test already runs in presubmitandroid-s-beta-2android-s-beta-1Julien Desprez
alarm_test is already part of host-unit-tests presubmit, no need to be define for test mapping postsubmit Change-Id: I5e96328cd94bb8eb8132851f5105eac963a69390 Test: presubmit Bug: 183622274
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s ↵Xin Li
ours am: 61cbc7e0fa -s ours am: c76f443a68 -s ours am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id90eb60b660361f8701487454518df8d1fe03a69
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s ↵Xin Li
ours am: 61cbc7e0fa -s ours am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie98b3d8a775fa63a339157b022b8655e899c8ccc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e16e89e127 -s oursXin Li
am skip reason: Change-Id I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 with SHA-1 b8a1eb3828 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41d03245e0cf705e26fc7b66f009114fa82515ef
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5 Change-Id: I656f59448ea21dd3a3cc86a6f3d7ab263288ba23
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 am: 31ea9a7237 am: d2d109b269 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I54f631cd1d5eaace4959119ae28b3f6d7f7ab52b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 am: 31ea9a7237 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06b5b4128b30af2a719117f06eafe909804053b7
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960 am: ↵Bob Badour
7758608f66 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic577dd784fe04488ddebe13ba120e85e022da5ed
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc am: caf1c07960Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1588888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33862a8c787499e7b1be297ee050760270454c8a
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpcandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: test/core/util/Android.bp test/cpp/common/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-ISC SPDX-license-identifier-MIT SPDX-license-identifier-MPL-2.0 SPDX-license-identifier-Zlib legacy_unencumbered to: Android.bp Added SPDX-license-identifier-BSD to: third_party/address_sorting/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5412696bd8aa63438e034a7e4664255c61e289d7
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f am: 428e163032 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39729d7232ef9a42133d1967a162c84bcbc868d9
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 am: 6d570f331f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbe9c24554caf4a75d73214a3e42dd390009656f
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21 am: ↵Bob Badour
b750f56c47 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7f7b80fa04eeaa8d66c4b62663b46b57d2ecb4b
2021-02-01Fix license_type. Contains MPL in certificate source am: bce9627e21Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1565174 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ca154cbabcdc6b35a73c889c2c5b4da98942a0e
2021-01-28Fix license_type. Contains MPL in certificate sourceBob Badour
See: http://go/android-license-checking-v2-lsc https://android.googlesource.com/platform/external/grpc-grpc/+/master/etc/roots.pem https://android.googlesource.com/platform/external/grpc-grpc/+/master/src/android/test/interop/app/src/main/assets/roots.pem Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: Icfea2c086763ada93bf987980204776bb2e4f953
2020-11-24Mark ab/6881855 as merged am: 9005cccbf7 am: b8a1eb3828Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/13110515 Change-Id: I2d8de4e1d9a49bf1ee441aecc8a690175f51d30f
2020-11-24Mark ab/6881855 as merged am: 9005cccbf7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/13110515 Change-Id: I1436c5cc1f1bb9e57af1702cc3421e20ff962ad5
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I5771870298a4f9bdb8d0a4089240cba0f1dd6be4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s ours am: ↵Xin Li
ec69d49c2d -s ours am: 2e8c2bb1e8 -s ours am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: I582667086593895302e21360c5816c1f6c59a173
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s ours am: ↵Xin Li
ec69d49c2d -s ours am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: Icb70e081202744995f02a13d9fc712858c07ba26
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f5c23c499 -s oursXin Li
am skip reason: Change-Id Idb0a057efdf0f9358c31db1983344cc88e82d2ff with SHA-1 516f31dd01 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12796085 Change-Id: I5ffb7c2d12a6b86cc73f2283962284e0311d5a0e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Idb0a057efdf0f9358c31db1983344cc88e82d2ff Change-Id: I24b6d090aa0587a3447d06d6e77d66255c764e15
2020-09-13Add bionic vm_sockets header am: b1dbb1d2a2 am: d11d14cd11Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I4728927c7b92d6c290cfcb320edd454b450aad86
2020-09-13CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 5696073f32 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11376853 Change-Id: I2348101d01e9891acc64fc4ba770668d10606486
2020-09-11[automerger skipped] Merge Android R am: bc1ebd11f9 -s ours am: a12968c8a7 ↵Xin Li
-s ours am: 9a7e0a8062 -s ours am: f0bfdf1b4c -s ours am: 15469ea8fc -s ours am skip reason: Change-Id Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa with SHA-1 a7a7c08bf9 is in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1422354 Change-Id: I4e8cd4469e67a1c3b3dbbba0687065b2bf471658
2020-09-11[automerger skipped] Merge Android R am: bc1ebd11f9 -s ours am: a12968c8a7 ↵Xin Li
-s ours am: 9a7e0a8062 -s ours am: f0bfdf1b4c -s ours am skip reason: Change-Id Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa with SHA-1 a7a7c08bf9 is in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1422354 Change-Id: I9232c74e6257226bfc9b3685d1f6c70a2725936a
2020-09-11[automerger skipped] Merge Android R am: bc1ebd11f9 -s ours am: a12968c8a7 ↵Xin Li
-s ours am: 9a7e0a8062 -s ours am skip reason: Change-Id Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa with SHA-1 a7a7c08bf9 is in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1422354 Change-Id: Iba23cefcc950fdda360cff28dda4bbe7e3429a5c
2020-09-11[automerger skipped] Merge Android R am: bc1ebd11f9 -s ours am: a12968c8a7 ↵Xin Li
-s ours am skip reason: Change-Id Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa with SHA-1 a7a7c08bf9 is in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1422354 Change-Id: If441c4cf77e5d6cc027631277942fe9eb1fd6e5d
2020-09-11[automerger skipped] Merge Android R am: bc1ebd11f9 -s oursXin Li
am skip reason: Change-Id Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa with SHA-1 a7a7c08bf9 is in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/1422354 Change-Id: Iccd83b97613df5bf5852756daa346f9cb0b6eebf
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa Change-Id: I2ce2b5075de3d2b0acccc847befbe699a02e68c9
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7a7c08bf9 -s ours am: 12f14280f1 -s ours am: abc356a3b2 -s ours am: 80f4bc4cd3 -s ours am skip reason: Change-Id Ie6dff8b4043f84b9d9282364d17ec001b5bacc62 with SHA-1 da6bf64cf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12470113 Change-Id: I21765d63210e42f32d75d006b755b0345a6bf402
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7a7c08bf9 -s ours am: 12f14280f1 -s ours am: abc356a3b2 -s ours am skip reason: Change-Id Ie6dff8b4043f84b9d9282364d17ec001b5bacc62 with SHA-1 da6bf64cf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12470113 Change-Id: I7a26ed6f40a8dbc567198a720f66231b440df14f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7a7c08bf9 -s ours am: 12f14280f1 -s ours am skip reason: Change-Id Ie6dff8b4043f84b9d9282364d17ec001b5bacc62 with SHA-1 da6bf64cf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12470113 Change-Id: I0d40f8275874b8b4ab3e4fa7888ce96da31812a8
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7a7c08bf9 -s ours am skip reason: Change-Id Ie6dff8b4043f84b9d9282364d17ec001b5bacc62 with SHA-1 da6bf64cf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/12470113 Change-Id: I99dc4a601e3b2c24f7edbb7225a1603a50bc1edc
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ie6dff8b4043f84b9d9282364d17ec001b5bacc62 Change-Id: Ib41530fa7ef96c5ac5c54ecfc0c7c0b3a2e1aaaa
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8feda am: 75bfcd0521 ↵Hao Chen
am: 1069a33f04 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I0213b8faafeb6a50174be42ad715b9a0ea631715
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: da6bf64cf9 am: 516f31dd01 ↵Hao Chen
am: d25ab3fddc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Ifa76ba6cb0a48a850af824830d7dfe730487ac99
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8feda am: 577750a464 ↵Hao Chen
am: 1de16a9ea3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I9ff58f6d6149b30e019936afe5741009dedbcd81
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8feda am: 75bfcd0521Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I8542d2478b574bb6723657578ae16f370d26e290
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: da6bf64cf9 am: 516f31dd01Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Id14371fef506396fd00d207abe4cd902a5ccc457
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8feda am: 577750a464Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I62f39d8d7e1d36b5e86fffa6a79a5c8898e7a61d
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: da6bf64cf9Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Idb0a057efdf0f9358c31db1983344cc88e82d2ff
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8fedaandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseHao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Ie7422028d040b807f47e321ba9c0d64fcf3aae86
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2 am: 296ab8fedaHao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Ie552581c21f389fb91eb08e88a1a06c0cd9fef83
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2android-11.0.0_r16android11-d1-b-releaseHao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I1b3f91a436aa949326110acfd91a8b845626a6c8
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2Hao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: Ie6dff8b4043f84b9d9282364d17ec001b5bacc62