aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-21Enable windows targetHEADmastermainMatt Gilbride
`//tools/apksig` build targets will soon depend on this, and windows must be enabled (transitively) on all dependencies. Bug: 319296492 Test: TH Change-Id: I601fecdc6c6c0898c90556c4c2aa1d24df66bbfd
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I237c4fe809a79267e8a8eed50e3f2cc2768c7264 Change-Id: I612c1af8861bfac59108aa84d5cfce091e6f5a0e
2024-01-31Use plugin to build gRPC lib for grpc-java-reflection am: 36ff546fabtemp_319669529Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2933470 Change-Id: I237c4fe809a79267e8a8eed50e3f2cc2768c7264 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30Use plugin to build gRPC lib for grpc-java-reflectionKrzysztof Kosiński
Also include grpc-java-reflection in grpc-java lib. Bug: 306500189 Test: build Change-Id: I141d782944c0360a84317357c37c37487e02d035
2024-01-29Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343 Change-Id: I6a9fff4df010c07b2e9213ece8649a8ee857a160
2024-01-26Add a module for grpc-java-reflection am: a6b4cb0e24Dan Shi
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2927291 Change-Id: I98b001edd9a5da751fe22175fd84e53351fc3f65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25Add a module for grpc-java-reflectionDan Shi
Bug: 306500190 Test: build Change-Id: If76d94469397266e3e6226afba55b3da9f10eb9f
2023-11-10[automerger skipped] Adding soong build rule for grpc-binder am: 9cf6f76c0a ↵Sunny Goyal
am: e87f57bc63 -s ours am: 69c60cf61f -s ours am skip reason: Merged-In Icb7d6ef42b4ddd09b04b766dbea26546ceedd343 with SHA-1 9cf6f76c0a is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: I4eb317db47386ff768ae338a1ae11e177d645eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10[automerger skipped] Adding soong build rule for grpc-binder am: 9cf6f76c0a ↵Sunny Goyal
am: d30a50e765 am: e94d356fdd -s ours am skip reason: Merged-In Icb7d6ef42b4ddd09b04b766dbea26546ceedd343 with SHA-1 30a6532bec is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: I0edc52798c97ba76f0532f451dcd3c8b42bd7d60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10[automerger skipped] Adding soong build rule for grpc-binder am: 9cf6f76c0a ↵Sunny Goyal
am: e87f57bc63 -s ours am skip reason: Merged-In Icb7d6ef42b4ddd09b04b766dbea26546ceedd343 with SHA-1 9cf6f76c0a is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: Ice00adba4a4aaa5d129d9fece3481f07865020d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Adding soong build rule for grpc-binder am: 9cf6f76c0a am: d30a50e765Sunny Goyal
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: I9c08bed70f619619acd956cadbf4670c3f6dfcac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Adding soong build rule for grpc-binder am: 9cf6f76c0aSunny Goyal
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: I8d29e26324669636231847b7bc0a52c1fc532e32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Adding soong build rule for grpc-binder am: 9cf6f76c0aSunny Goyal
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2826651 Change-Id: I8113aeb57e4ee133c372a1dbfb65c78442001314 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Adding soong build rule for grpc-binderSunny Goyal
Bug: 266975895 Test: make grpc-java-binder (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:30a6532bec1d8a2f59f207f4fc113c12db2d99c0) Merged-In: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343 Change-Id: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343
2023-11-09Adding soong build rule for grpc-binderSunny Goyal
Bug: 266975895 Test: make grpc-java-binder Change-Id: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343
2023-09-22Wrap gen_annotations.py in python_binary_host am: acc04b8ffd am: 7edf41541d ↵Zi Wang
am: 63ac4245f2 am: cfe93831fe am: 177c5e9ec0 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2755687 Change-Id: I55430f40d5158aa4b42e6b2b29f5db4fdc7ee7c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Wrap gen_annotations.py in python_binary_host am: acc04b8ffd am: 7edf41541d ↵Zi Wang
am: 63ac4245f2 am: cfe93831fe Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2755687 Change-Id: I1308825659d5fb3f2f8d652cb2c5641758664a36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Wrap gen_annotations.py in python_binary_host am: acc04b8ffd am: 7edf41541d ↵Zi Wang
am: 63ac4245f2 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2755687 Change-Id: I22b3887b7079c473884c5122d555b2d10c740b4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Wrap gen_annotations.py in python_binary_host am: acc04b8ffd am: 7edf41541dZi Wang
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2755687 Change-Id: I4cdc55a9ebd35dffdde9b0543954bb358f77afa2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Wrap gen_annotations.py in python_binary_host am: acc04b8ffdZi Wang
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2755687 Change-Id: Ia4e2472f4bd5f6a320dba10a887df5738fb0a6e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Wrap gen_annotations.py in python_binary_hostZi Wang
So that CI python can build grpc-java-annotation-stubs-srcjar correctly Test: m and CI Bug: 301138784 Change-Id: I57d1cf2a4d9b1a3b0ae50d0b645fc3ac24bdb3e2
2023-08-23Use Truth library built from source. am: 2d18351e54 am: a5baa2adfb am: ↵Krzysztof Kosiński
75b5e98a00 am: 914e794505 am: b1b64cdbd3 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2721440 Change-Id: I89f5deb217733a53385fdf02101771f05c0c8426 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 2d18351e54 am: a5baa2adfb am: ↵Krzysztof Kosiński
75b5e98a00 am: 914e794505 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2721440 Change-Id: I2d871703970bb3e581836bc2ec3889d5cf7d7bc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 2d18351e54 am: a5baa2adfb am: ↵Krzysztof Kosiński
75b5e98a00 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2721440 Change-Id: Ib3cab78e040f554342735b7dbbaad4433974c2e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 2d18351e54 am: a5baa2adfbKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2721440 Change-Id: Icf0fb8e95e17af42c791c90179dcdcae37a4f333 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 2d18351e54Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2721440 Change-Id: I85411c017f16f3b3e3759e5e188cb00f188e2f6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: I51a97ff16a6ef37901b447290829333e5bc69346
2023-07-27Update METADATA to reflect recent version bump am: 098959951e am: 4b2ddda2d2 ↵Oleg Shaldybin
am: 865b0fb95d am: bacc165235 am: c736eee321 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2677724 Change-Id: Icd1b6bd20c975bec6f92bb31ef35483edcbfdebb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Update METADATA to reflect recent version bump am: 098959951e am: 4b2ddda2d2 ↵Oleg Shaldybin
am: 865b0fb95d am: bacc165235 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2677724 Change-Id: I4320b29bbfa87503cbb51fcb2e204e6359c38d31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Update METADATA to reflect recent version bump am: 098959951e am: 4b2ddda2d2 ↵Oleg Shaldybin
am: 865b0fb95d Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2677724 Change-Id: I43530998e727beef05bda1030944b4bbd2a4d4bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Update METADATA to reflect recent version bump am: 098959951e am: 4b2ddda2d2Oleg Shaldybin
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2677724 Change-Id: I2f6a1eb4299440084cf29653b19db689cff46abf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Update METADATA to reflect recent version bump am: 098959951eOleg Shaldybin
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2677724 Change-Id: I2882237a4b98af9731038dc8b83a7f3dd1a4007b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Update METADATA to reflect recent version bumpOleg Shaldybin
Test: n/a Bug: 290415485 Change-Id: I816843ce59af2954157c06a63682369903a13a22
2023-07-24[automerger skipped] Skip Android U (ab/10368041) am: 5929e7a672 -s ours am: ↵Xin Li
da7a11bac5 -s ours am: a403852c9c -s ours am: 7dd98ad86a -s ours am skip reason: Merged-In I208ae11e35dd991fad410e5e817d5663a3e076b7 with SHA-1 85242a2cc3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/24180035 Change-Id: Idd5cbfa88d5357f0f2331d7ac77ebd04beb35a1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24[automerger skipped] Skip Android U (ab/10368041) am: 5929e7a672 -s ours am: ↵Xin Li
da7a11bac5 -s ours am: a403852c9c -s ours am skip reason: Merged-In I208ae11e35dd991fad410e5e817d5663a3e076b7 with SHA-1 85242a2cc3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/24180035 Change-Id: I4e41c10f4a5331becb0caf4b93c33168b8cefedd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24[automerger skipped] Skip Android U (ab/10368041) am: 5929e7a672 -s ours am: ↵Xin Li
da7a11bac5 -s ours am skip reason: Merged-In I208ae11e35dd991fad410e5e817d5663a3e076b7 with SHA-1 85242a2cc3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/24180035 Change-Id: Ie765f38aec4e69270f2dee3039d79c8ce752b150 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24[automerger skipped] Skip Android U (ab/10368041) am: 5929e7a672 -s oursXin Li
am skip reason: Merged-In I208ae11e35dd991fad410e5e817d5663a3e076b7 with SHA-1 85242a2cc3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/24180035 Change-Id: Ic15ec1e7c2577e23cb1e8e22ccdc302961d5a712 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Skip Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I208ae11e35dd991fad410e5e817d5663a3e076b7 Change-Id: I3f7edace1dbd59f695d7e4738ad3f181f36ec0f0
2023-07-11[automerger skipped] Merge changes from topic "grpc-java-aosp" into main am: ↵Oleg Shaldybin
b94a717fb6 am: 484c987f44 am: b03239b685 -s ours am: d7dc4feed5 -s ours am: 48d1ab5919 -s ours am: c6eaca736e -s ours am skip reason: Merged-In I6a476f5bee766ebb8bd571a7b3c4e08194b9ab48 with SHA-1 f335d4e6b1 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: I857774e91286ebf36c72234957d02cc3a00e04ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Update grpc-java to upstream v1.56.x am: 6d0951eccb am: ↵Oleg Shaldybin
f9818f1635 am: e5c8f217e7 -s ours am: dde06d1841 -s ours am: 2a61530e11 -s ours am: c325bf8fbc -s ours am skip reason: Merged-In I97121aec0dd460b18a98bfbb9fb7bc75b6ac915b with SHA-1 3e766190c9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: Ideb0f289d9f32725fb027a9bbe07313429e222a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic "grpc-java-aosp" into main am: ↵Oleg Shaldybin
b94a717fb6 am: 484c987f44 am: b03239b685 -s ours am: d7dc4feed5 -s ours am: 48d1ab5919 -s ours am skip reason: Merged-In I6a476f5bee766ebb8bd571a7b3c4e08194b9ab48 with SHA-1 f335d4e6b1 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: If26ae749ea80bf4c073375afc091086dbd3a3d8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Update grpc-java to upstream v1.56.x am: 6d0951eccb am: ↵Oleg Shaldybin
f9818f1635 am: e5c8f217e7 -s ours am: dde06d1841 -s ours am: 2a61530e11 -s ours am skip reason: Merged-In I97121aec0dd460b18a98bfbb9fb7bc75b6ac915b with SHA-1 3e766190c9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: Iffbba63bf1cdee8fe15bcfbc2f9f616dd532b027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic "grpc-java-aosp" into main am: ↵Oleg Shaldybin
b94a717fb6 am: 484c987f44 am: b03239b685 -s ours am: d7dc4feed5 -s ours am skip reason: Merged-In I6a476f5bee766ebb8bd571a7b3c4e08194b9ab48 with SHA-1 f335d4e6b1 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: I9199b0ca92e98f4b7fc7ae795f19cf2c077c982b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Update grpc-java to upstream v1.56.x am: 6d0951eccb am: ↵Oleg Shaldybin
f9818f1635 am: e5c8f217e7 -s ours am: dde06d1841 -s ours am skip reason: Merged-In I97121aec0dd460b18a98bfbb9fb7bc75b6ac915b with SHA-1 3e766190c9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: I667fae8d2c264be20cf2d4c7b178545e2d4454fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Merge changes from topic "grpc-java-aosp" into main am: ↵Oleg Shaldybin
b94a717fb6 am: 484c987f44 am: b03239b685 -s ours am skip reason: Merged-In I6a476f5bee766ebb8bd571a7b3c4e08194b9ab48 with SHA-1 f335d4e6b1 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: I3e23279e731e5690bd6537675ebecba589415b99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11[automerger skipped] Update grpc-java to upstream v1.56.x am: 6d0951eccb am: ↵Oleg Shaldybin
f9818f1635 am: e5c8f217e7 -s ours am skip reason: Merged-In I97121aec0dd460b18a98bfbb9fb7bc75b6ac915b with SHA-1 3e766190c9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: I8d45feb9b70211dc19b6c1a3fca0aaf65f6ed221 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge changes from topic "grpc-java-aosp" into main am: b94a717fb6 am: ↵Oleg Shaldybin
484c987f44 Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: I9a7fd16a8393ec27fef4747eb64b223c4a2749ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Update grpc-java to upstream v1.56.x am: 6d0951eccb am: f9818f1635Oleg Shaldybin
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: I02a34fb004fc3ee9eb6265e377ed11a26fe1d8a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge changes from topic "grpc-java-aosp" into main am: b94a717fb6Oleg Shaldybin
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2640431 Change-Id: I747e63a88a88e55dcbe0bbb1e9fee73b1d1a288a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Update grpc-java to upstream v1.56.x am: 6d0951eccbOleg Shaldybin
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/2632049 Change-Id: I4fc67c4f52848db522c1c9141428b534f0de0701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 11:05:13 +0000