aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-06-18Add bionic vm_sockets header am: b1dbb1d2a2android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseHao Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/11889505 Change-Id: I3f4078149d2e3acba7cefc789404712f13e17307
2020-06-18Add bionic vm_sockets headerandroid11-devHao Chen
When building host side program, we are building with glibc in the Android tree, which is very old and has no vsock header. So we add the boinic libc vsock header. Bug: 157603385 Test: build and create Acloud local instance Change-Id: I5c7176c70779fee5db1cd2fd4baf5bd653fb3051
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 57ef1d3d00 am: fbc3d16da6 am: e68b1200b7 Change-Id: I31a9d596734604a91d70bb6612179ec885a757b3
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 am: 94104bd878 am: f2359b07d4 Change-Id: I87aae06f27bedb2fe83a328f685f5b9e3b2ceac5
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 am: 2f8af06b2d am: 4f2e34a700 Change-Id: Ib1666d96153606c3919db8be5423d1269febbba0
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 57ef1d3d00 am: fbc3d16da6 Change-Id: I8c194f60aba5a74ad4bd66d3788708bd70411d16
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 am: 94104bd878 Change-Id: I7e896bf54b7c5c2396ab73749580e139001c29bb
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 am: 2f8af06b2d Change-Id: I21ec5cf19c6d152cee9681dc78a45e35f8e3a94c
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 57ef1d3d00 Change-Id: Ifff6824c546b168fb941addb3d169c229bd812b2
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 Change-Id: I5cb32bc8e7d1f7138e7afa2a046a7bafb9c0a656
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf am: 6c6c7b2430 Change-Id: Ie11d77f80b82aef6b2c5d2bbc5f92daf07806cf9
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf Change-Id: I6b042e67b71041e9b5902e72e90f0c9e28b1593f
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf Change-Id: I71f6dda90d9f07cadc28c54da51045a4f03e3288
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 am: b89d5835cf Change-Id: Ic226cdd3e6360af981ab76f0e7ffed4c1b3b88fd
2020-05-06CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 Bug: 155491613 Test: build Change-Id: I756de2ba4ee799c59ad89c15cc974925affff52b (cherry picked from commit b48f7af7b31a2ee5140866bdea47ab066d964a96)
2020-05-04CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc am: 7a1fdff235 Change-Id: I756de2ba4ee799c59ad89c15cc974925affff52b
2020-05-04CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 am: 24445591cc Change-Id: Iced8071694c628df3d937261f62f2fff0fc8a112
2020-05-04CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eae am: ↵Hao Chen
cb4eb9d460 Change-Id: I517a87eb3a52eca0237249c6956e6bafdf97ffc3
2020-05-04CMake: Give a binary dir to cares library am: 00c1189961 am: e5624b1eaeHao Chen
Change-Id: I654d936bb580586dd8b96c2fdf27190f72bf15f9
2020-05-04CMake: Give a binary dir to cares library am: 00c1189961android-r-beta-3android-r-beta-2Hao Chen
Change-Id: I7531328b585786d8e1cbbfa13283d76eb66dc0ed
2020-05-04CMake: Give a binary dir to cares libraryHao Chen
So that we can add the cares source from outside of the grpc root. Bug: 155491613 Test: build Change-Id: Ic1464afdf609513586602621510a5e7e894f9613
2020-04-30Add METADATA to grpc-grpc: Apache2+BSD+MIT+ISC+zlib=NOTICE am: 42c9239802 ↵Bob Badour
am: 212bf5d476 am: 524016bb26 am: 7bf848eab2 am: daf7adced8 Change-Id: I90a574ed266456fb71a713739e857b7e425c99d5
2020-04-30Add METADATA to grpc-grpc: Apache2+BSD+MIT+ISC+zlib=NOTICE am: 42c9239802 ↵Bob Badour
am: 212bf5d476 am: 524016bb26 am: 7bf848eab2 Change-Id: I90b59a835e6439d2fcaebf4b002f764e46450c9a
2020-04-30Add METADATA to grpc-grpc: Apache2+BSD+MIT+ISC+zlib=NOTICE am: 42c9239802 ↵Bob Badour
am: 212bf5d476 am: 524016bb26 Change-Id: I9891443de0ff273ac8345c0074211d2aaa9fc84c
2020-04-30Add METADATA to grpc-grpc: Apache2+BSD+MIT+ISC+zlib=NOTICE am: 42c9239802 ↵Bob Badour
am: 212bf5d476 Change-Id: Id4c7a1da74e6178db4c9fbbfb440ea766fd6bb1c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 12:50:58 +0000