aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: 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 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: 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-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-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-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 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 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 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 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: I9bce75467dbc465b2c3bea0cde269fc065fe614d
2020-06-30Remove gRPC Netty shaded static library am: b6ad5d62b2 am: ffea17686f am: ↵Hadrien Zalek
764ec8e806 am: 5905c8a940 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: I3fc2b46f2fe7044abfcef2ea018975299f873f19
2020-06-30Build the gRPC Java OkHttp library from source am: 332041b059 am: c628597f30 ↵Hadrien Zalek
am: 4072341397 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: Ibf1a3f93b1c8e710bbca7447637708aa5f6c15e8
2020-06-30Remove gRPC Netty shaded static library am: b6ad5d62b2 am: ffea17686f am: ↵Hadrien Zalek
764ec8e806 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: Idc62b10fdd5f5d153f2bfc525f5ef8ab09a79de8
2020-06-30Build the gRPC Java OkHttp library from source am: 332041b059 am: c628597f30Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: Iccd71c35ba766fd51f51281c258c6aeb1c1302a5
2020-06-30Remove gRPC Netty shaded static library am: b6ad5d62b2 am: ffea17686fHadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: I7a1ccbee4b0bef230ad42ef306149af0defaabcd
2020-06-30Build the gRPC Java OkHttp library from source am: 332041b059Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: I201f41dfe0c17ad98e89e3e6513e6f907602f9d0
2020-06-30Remove gRPC Netty shaded static library am: b6ad5d62b2Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: Ib052bfe4ad30c52a29acc0526a78f5d2ca9358a7
2020-06-30Build the gRPC Java Authentication library am: 2bf353cc26 am: b5cb35def9 am: ↵Hadrien Zalek
0b1482d419 am: 2764552cae Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: I86f6b5e4d47064db17f83d797f5dc799e4eb9b3d
2020-06-30Build the gRPC Java Authentication library am: 2bf353cc26 am: b5cb35def9 am: ↵Hadrien Zalek
0b1482d419 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: I9b24d5e94293312c7af2bce731bb0fc529776361
2020-06-30Build the gRPC Java Authentication library am: 2bf353cc26 am: b5cb35def9Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: If6e1365391030c533d38bd6f64898d89cc60efcd
2020-06-30Build the gRPC Java Authentication library am: 2bf353cc26Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: Iea74356cb326cb073abcbb3e0faecdf4a6092104
2020-06-29Build the gRPC Java OkHttp library from sourceandroid-r-beta-3android-r-beta-2Hadrien Zalek
Add a Soong module to build the gRPC lightweight transport library which is based on OkHttp. Test: m grpc-java-okhttp Bug: 148404241 Change-Id: Ib5b6c3e29f4e791a726130117ba53c417c25a0f0
2020-06-29Remove gRPC Netty shaded static libraryHadrien Zalek
Remove the build module for the shaded library which causes issues at runtime due to missing symbols. This happens because the jar is prebuilt from an older version of gRPC and is no longer compatible with the current source. Additionally, the grpc-java module should not statically link against a specific transport jar that contains service providers. Doing so forces an automatically-loaded implementation on users. Test: m grpc-java Bug: 148404241 Change-Id: I77589c05756b55146648d726ea6e235f1887ac38
2020-06-29Build the gRPC Java Authentication libraryHadrien Zalek
Add a Soong module to build the gRPC authentication library from source. Test: m grpc-java-auth grpc-java Bug: 148404241 Change-Id: I8afdf8c14773de4c13889016b0bfd8b6da132548
2020-06-05Build the gRPC Java testing library am: 58f48cc424 am: 4ddf1be873 am: ↵Hadrien Zalek
5ddc0e62ca am: bf81fae4e6 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: Ia7c1d612411c33c0d90f24256adac1b24565e382