aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37078ff510 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 56e9e6f602 -s ours am skip reason: Change-Id I7a7d0a98c4afc0964d0f6d2324c5b04d26ce466e with SHA-1 416e81f33e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ff7ffd711d751ee1f2878c9058b4a4cd1dba92a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37078ff510 -s oursXin Li
am skip reason: Change-Id I7a7d0a98c4afc0964d0f6d2324c5b04d26ce466e with SHA-1 416e81f33e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If169cc3026900c3ea2a7ac2412df28ae089138c6
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I7a7d0a98c4afc0964d0f6d2324c5b04d26ce466e Change-Id: I7ca8d94e1ab6f9b926225942307416953445a879
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc-java am: 2690e046f4 am: ↵Bob Badour
3629b61cb4 am: a198509f05 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1588995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ee4aaf43e5d92b105962d3318a4d48c06490173
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc-java am: 2690e046f4 am: ↵Bob Badour
3629b61cb4 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1588995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b7cfd0782123ed1c00c226580c8f3b7c2b602ba
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc-java am: 2690e046f4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1588995 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d4a7dae2bcb5c2051e93c68ab876f09a784b2e1
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/grpc-grpc-javaandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp annotation-stubs/Android.bp auth/Android.bp compiler/Android.bp context/Android.bp core/Android.bp netty/shaded/Android.bp okhttp/Android.bp protobuf-lite/Android.bp protobuf/Android.bp stub/Android.bp testing/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I98975a2b1aa17d6a6b70cfa41f0b9ce6e217489b
2020-12-17Update gRPC Java Testing Lib to build Host and Android clients. am: ↵Karl Shaffer
a97c369d0c am: 400d5deff6 am: 416e81f33e Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1531218 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d01a9660e7feb55a8faf576cc320c6f138fc356
2020-12-17Update gRPC Java Testing Lib to build Host and Android clients. am: ↵Karl Shaffer
a97c369d0c am: 400d5deff6 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1531218 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a7d0a98c4afc0964d0f6d2324c5b04d26ce466e
2020-12-17Update gRPC Java Testing Lib to build Host and Android clients. am: a97c369d0cKarl Shaffer
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1531218 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d44aebe72c45b727c6ba3da59c95e13a9b1a6fe
2020-12-15Update gRPC Java Testing Lib to build Host and Android clients.Karl Shaffer
Migrates the grpc-java-testing target to java_library target to enable the target to be used by both host and Android libraries (and tests). Test: m grpc-java-testing Bug: 168812333 Change-Id: Id8d618f60f7d95e840d9555b62736076da4d4fd2
2020-11-24Mark ab/6881855 as merged am: 175e8722af am: 2900e83205Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/13112816 Change-Id: I01a2b4270be711d556365d1bd84c77a22a4ecc53
2020-11-24Mark ab/6881855 as merged am: 175e8722afXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/13112816 Change-Id: I68cf5ca14318b4b76b23977311487a02bf3417d4
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ib456466ccd72eb296ea8aefef4e34d6a343a4f45
2020-11-19Add a lite OkHttp gRPC Client Library. am: 8e51fde6c2 am: 7b5246a00c am: ↵Karl Shaffer
b41363ac7d am: e1e5895527 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1503871 Change-Id: I1e9888e161df93940d49f2fedbfee4b8a0bb57f1
2020-11-18Add a lite OkHttp gRPC Client Library. am: 8e51fde6c2 am: 7b5246a00c am: ↵Karl Shaffer
b41363ac7d Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1503871 Change-Id: I6a8f57697794fa14c63315ca1a8e8a84e4305a78
2020-11-18Add a lite OkHttp gRPC Client Library. am: 8e51fde6c2 am: 7b5246a00cKarl Shaffer
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1503871 Change-Id: Ic7abea463789d2e4f13f97b054862bb31543bda6
2020-11-18Add a lite OkHttp gRPC Client Library. am: 8e51fde6c2Karl Shaffer
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1503871 Change-Id: Ie1268a8709dc05e79827a1d3881a8137e9542fa1
2020-11-18Add a lite OkHttp gRPC Client Library.Karl Shaffer
Updates several targets within grpc-grpc-java to allow for Android and Host targets to allow the building of a gRPC client library that uess OkHttp and Protobuf Lite. This provides a lightweight client library for gRPC clients that works on both Android and Host since it uses lite protos rather than full protos. Test: m grpc-java-okhttp-client-lite Test: mm Test: Manual testing using client library on Android. Change-Id: Ib9dc14a44856914b38662c01905337f98bd8d108
2020-11-02[automerger skipped] Rebase to master@68888117 am: 599cbd6b78 -s oursDavid Dietrich
am skip reason: Change-Id I7ae611add53627d2c00beeeac829fa31069d5594 with SHA-1 4cff808a49 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12778523 Change-Id: I862235858c53405ae33183399bef27f26bd1c0da
2020-11-02Updates the grpc-java-okhttp target to make use of a non-repackaged OkHttp ↵Karl Shaffer
target: am: 30a843d392 am: 8b75b1150b am: 04ea101281 am: 6406ebf52e Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1479296 Change-Id: I614744e9e3e74d9603d321e9b1bc871e6191c58d
2020-11-02Updates the grpc-java-okhttp target to make use of a non-repackaged OkHttp ↵Karl Shaffer
target: am: 30a843d392 am: 8b75b1150b am: 04ea101281 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1479296 Change-Id: I0594a4764c007e1a7dab48f83f70ceed487c53f7
2020-11-02Updates the grpc-java-okhttp target to make use of a non-repackaged OkHttp ↵Karl Shaffer
target: am: 30a843d392 am: 8b75b1150b Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1479296 Change-Id: If853b7919f6c6645a89409498631951f17fdfd61
2020-11-02Updates the grpc-java-okhttp target to make use of a non-repackaged OkHttp ↵Karl Shaffer
target: am: 30a843d392 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1479296 Change-Id: Ibcf4aaaf90b850ad659461c86e63772d8e0ab5df
2020-10-29Updates the grpc-java-okhttp target to make use of a non-repackaged OkHttp ↵Karl Shaffer
target: - Updates the grpc-java-okhttp target to use the okhttp-norepackage target which allows for building both Android and Host libraries with this target. Test: m grpc-java-okhttp Bug: 168812332 Change-Id: I7a45ab84d919a7e9677f46a9c9d65d0838c4c95e
2020-10-14Rebase to master@68888117android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseDavid Dietrich
Change-Id: Iaa8f16c2bb3a85af73de5884916a53695ef9ef86 Exempt-From-Owner-Approval: rebase BUG: 160122832 Merged-In: I7ae611add53627d2c00beeeac829fa31069d5594
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eb047d0bc5 -s ours am: ↵Xin Li
3a420137d8 -s ours am: 939ce4cfdb -s ours am skip reason: Change-Id I6610d550b62b63204f1427544f7f6b501261f9a5 with SHA-1 24cfcd7b5b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12796863 Change-Id: Ib2f1c94f39b110a96a444eabcb53e1db68cb7177
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eb047d0bc5 -s ours am: ↵Xin Li
3a420137d8 -s ours am skip reason: Change-Id I6610d550b62b63204f1427544f7f6b501261f9a5 with SHA-1 24cfcd7b5b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12796863 Change-Id: I0c3ec9a181f538b5daea0a60a15349b41a1c1177
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eb047d0bc5 -s oursXin Li
am skip reason: Change-Id I6610d550b62b63204f1427544f7f6b501261f9a5 with SHA-1 24cfcd7b5b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12796863 Change-Id: Ib6732b84d37b1be92c99247cc033e35cadfbcc19
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I6610d550b62b63204f1427544f7f6b501261f9a5 Change-Id: I47a105e388b17cb9cffc4ecc26e5a605b843b3e9
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 6444708c4b -s ours am: a1b0faa1d4 -s ours am: f8683d400e -s ours am: e9e35b9f76 -s ours am skip reason: Change-Id Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 with SHA-1 4072341397 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12469910 Change-Id: Id49a20155610e9e750fcf16749abb16623a5e1f5
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 6444708c4b -s ours am: a1b0faa1d4 -s ours am: f8683d400e -s ours am skip reason: Change-Id Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 with SHA-1 4072341397 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12469910 Change-Id: I3699ac49cb71e92d8387eda604292b296601c30e
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 6444708c4b -s ours am: a1b0faa1d4 -s ours am skip reason: Change-Id Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 with SHA-1 4072341397 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12469910 Change-Id: I69f95fe6dcbfe5615102ab441bf5e8910bbd9b8a
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 6444708c4b -s ours am skip reason: Change-Id Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 with SHA-1 4072341397 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/12469910 Change-Id: I4b3b7d6d3d84d5aced457e966fdc9d70ecd8ca2f
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 Change-Id: Ibce9567a2c3e66848efb29cbc2204d1a1595de4c
2020-07-27Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14 am: ↵Hadrien Zalek
29ebc18900 am: 26355262c7 am: 24cfcd7b5b am: 8859dfe2b2 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I8a143bc403cf1c4334abb60e8d29c35c7bbcb877
2020-07-27Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14 am: ↵Hadrien Zalek
29ebc18900 am: 26355262c7 am: 24cfcd7b5b Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I80d2e2c52b43e8899a97f771236b999701adbc31
2020-07-27Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14 am: ↵Hadrien Zalek
29ebc18900 am: 26355262c7 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I6610d550b62b63204f1427544f7f6b501261f9a5
2020-07-27Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14 am: ↵Hadrien Zalek
29ebc18900 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I0bf724b741d84c5c249f9a68827e59bff7f07ecb
2020-07-27Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I432dccbb1b3d95f4aea2cb4164b858c235df8ba0
2020-07-27Merge "Add a build module for the Netty Shaded library"Hadrien Zalek
2020-07-25Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8ab am: f28fd1b7cb am: ↵Hadrien Zalek
d68fec8751 am: 8562a75e2f am: 1d9b3ded76 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: I02607f1bbb7b077615f2d338b981fce72b05799e
2020-07-25Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8ab am: f28fd1b7cb am: ↵Hadrien Zalek
d68fec8751 am: 8562a75e2f Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: Iedabb441d3d9032d9668ff9ae39945d75fdfae11
2020-07-25Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8ab am: f28fd1b7cb am: ↵Hadrien Zalek
d68fec8751 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: I63d5060c2f61f35c34825b4dd4ab47347d7a2188
2020-07-25Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8ab am: f28fd1b7cbHadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: Ia354e58174fac073abed49f0678f630519237189
2020-07-25Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8abHadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: I210fb442e553d26a0537f14b91779d6bd00612c1
2020-07-24Merge tag 'upstream/v1.16.1' into HEADHadrien Zalek
Update the Java gRPC implementation source to that of a released version (v1.16.1) instead of some intermediate commit after v1.15.0. Test: m grpc-java Bug: 148404241 Change-Id: I9c072aee054a4aecc1bdf39adf45e9a243b907f5
2020-07-24Add a build module for the Netty Shaded libraryHadrien Zalek
The gRPC documentation recommends that most users use the Netty Shaded library for Transport Layer Security (TLS) on non-Android platforms. The library prepackages netty-tcnative on BoringSSL which makes it easier to use. Note that this change essentially restores the module which was deleted in a previous commit. This new binary is imported for the same version that the source is currently at and does not cause any runtime issues. Test: m grpc-java-netty-shaded Bug: 148404241 Change-Id: I7ae611add53627d2c00beeeac829fa31069d5594
2020-06-30Build the gRPC Java OkHttp library from source am: 332041b059 am: c628597f30 ↵Hadrien Zalek
am: 4072341397 am: a213f024b8 am: d630f9ad1a Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: Idd0d5b1933c2ee2d73ec54bfb80f2a87036d8d42
2020-06-30Remove gRPC Netty shaded static library am: b6ad5d62b2 am: ffea17686f am: ↵Hadrien Zalek
764ec8e806 am: 5905c8a940 am: 573699e25a Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: Ifacd00bde9efeaa464e1bfaf2af41bc6450b3dae
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:52:09 +0000