aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
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 am: d62b79133b Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: Ia9a728320dd568e25ce79a44705475d528e5083b
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-06Build the gRPC Java testing library am: 58f48cc424 am: 4ddf1be873 am: ↵Hadrien Zalek
5ddc0e62ca am: bf81fae4e6 am: 9fd77fa244 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: Ib2a308bd3f7ca4c7765be0861a4d44721fba066a
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
2020-06-05Build the gRPC Java testing library am: 58f48cc424 am: 4ddf1be873 am: 5ddc0e62caHadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: I59829b2c77dddbdede82f11b62a600a166bee468
2020-06-05Build the gRPC Java testing library am: 58f48cc424 am: 4ddf1be873Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: Ibb249787cd44429b4d218fa74fee949d557abf45
2020-06-05Build the gRPC Java testing library am: 58f48cc424Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: I846e1acea8703562e9409aa2d4fb4d57462a70be
2020-06-05Build the gRPC Java library from source am: 2d04a32487 am: 3124595792 am: ↵Hadrien Zalek
25601000b1 am: 41afd754ef am: 9221102b99 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: Icad13144f21fb96fe51a43d21f6768923f97811a
2020-06-05Build the gRPC Java library from source am: 2d04a32487 am: 3124595792 am: ↵Hadrien Zalek
25601000b1 am: 41afd754ef Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: I635621e0268a08b1c76372b0aced7f13dc878db1
2020-06-05Build the gRPC Java library from source am: 2d04a32487 am: 3124595792 am: ↵Hadrien Zalek
25601000b1 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: I799d129d6780af4085f71757ead6941e0362f91f
2020-06-05Build the gRPC Java library from source am: 2d04a32487 am: 3124595792Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: I27e97c9f5e338117c41b623f8aa1bd8d4b71e56c
2020-06-05Build the gRPC Java library from source am: 2d04a32487Hadrien Zalek
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: Id652034e32e520c3de0b6e81322b0f61c69457b2
2020-06-03Build the gRPC Java testing libraryHadrien Zalek
Add a build module for the testing library which provides utilities for more convenient unit testing of gRPC servers and clients. Test: m grpc-java-testing Bug: 148404241 Change-Id: I7f9894d0fb05c07b816aeae029a4293f194c9064
2020-06-03Build the gRPC Java library from sourceHadrien Zalek
Build the library from source since the imported prebuilts are inconsistent and incomplete. For starters, the source is that of version 1.15.0 but the imported jars are those of version 1.14.0. More importantly the grpc-java-protobuf library depends on the grpc-java-protobuf-lite library that is not prebuilt. This causes runtime errors due to missing symbols that should have been caught at compile-time. The Soong build modules follow the upstream Bazel rules as closely as possible. Note that some static libraries were added to the grpc-java to maintain compatibility with other rules that depend on it since the original prebuilt grpc-java-core jar contained all sources under core/ which is not how the library is built using Bazel. Test: m grpc-java Test: Diffed the entries between the old and new jars Bug: 148404241 Change-Id: I060333a68848272d5d9e09c040c1e35451a408c6
2020-04-30Add METADATA to grpc-grpc-java: Apache2=NOTICE am: fd308b8783 am: 830181d779 ↵Bob Badour
am: e5ac15ecf2 am: 270de0a541 am: afde2fc03a Change-Id: I02377cbd9e15dc020f3184a9d68781c9a75faf25
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:12:38 +0000