aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-30Merge "Enable windows targets for protobuf" into mainHEADmastermainTreehugger Robot
2024-03-18Enable windows targets for protobufMatt Gilbride
The `apksig`/`apksigner` build targets now rely on protbuf, and windows must be enabled (transitively) on all dependencies Bug: 319296492 Test: TH Change-Id: I7304e19b07a4b37dafbbc8496b153436f1d120f0
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea Change-Id: Iaf0688c7a895e0c308d2cc8f27f7c3e78e4ad4d3
2024-02-13Merge "Revert BUILD.bazel to v21.12." into main am: 10c6e11ed5temp_319669529Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2957432 Change-Id: I9a2e5c3ed40d20c6bc4ff15fab9c888d720198ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13Merge "Revert BUILD.bazel to v21.12." into mainYifan Hong
2024-02-09Revert BUILD.bazel to v21.12.Yifan Hong
Revert file to version f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c. Change-Id: Id4acc0b72990e010b4cc66aa4c9b3290a201b3e9
2024-01-23Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: Ic18a13c2c761d4805354d750d9b7794bdec32fe4 Change-Id: I231118710d594b86a61623c1d70de376fb3b57d8
2024-01-23Merge "remove btservices from apex available for libprotobuf-cpp-full" into ↵Treehugger Robot
main am: b020e298f9 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2647000 Change-Id: I9ea5fbb0aeb2690e7794b60856b835948417714a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-23Merge "remove btservices from apex available for libprotobuf-cpp-full" into mainTreehugger Robot
2023-10-12Merge "Move platform constraints to bazel_common_rules." into main am: ↵Jingwen Chen
8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed am: 4d3414774f Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: I5761fc10ca7cdae283ce9a0bfdbb0dde7f83b561 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Move platform constraints to bazel_common_rules." into main am: ↵Jingwen Chen
8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: I2bccdbb1acd8fd18e3ae3f9f96bb68f7bdb3d411 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Move platform constraints to bazel_common_rules." into main am: ↵Jingwen Chen
8da97eb01f am: f9c5752edc am: 7e78f71722 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: Ie3ca959c128757174b9a3995e50b4e58758f32cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Move platform constraints to bazel_common_rules." into main am: ↵Jingwen Chen
8da97eb01f am: f9c5752edc Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: I54d0f1cd0d26ec63b6037cc4cc07f702891e2663 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Move platform constraints to bazel_common_rules." into main am: ↵Jingwen Chen
8da97eb01f Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: Ie1bf001ac66af5e993ff39a56bec64ad797c6d98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Move platform constraints to bazel_common_rules." into mainJingwen Chen
2023-10-11Move platform constraints to bazel_common_rules.Cole Faust
This enables sharing of platform constraints between platform and kernel builds. Bug: 304594734 Test: treehugger Change-Id: Iad69fe46028a6974646d964a596ceee197eb449f
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ↵Xin Li
ours am: cad87045be -s ours am: d6f638e3d5 -s ours am: db79457a3e -s ours am: d378ab27c3 -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I39e13cd73bc29224f413c277c623280d19e9f3b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada ↵Xin Li
-s ours am: b47aa7524e -s ours am: e033b199ec -s ours am: de06ddd477 -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I369d53fca94c50f5e42dc3e75398717731655e02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ↵Xin Li
ours am: cad87045be -s ours am: d6f638e3d5 -s ours am: db79457a3e -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: Idab1f34228de90004c0f77fbccbe7a9fbac54260 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada ↵Xin Li
-s ours am: b47aa7524e -s ours am: e033b199ec -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: Iff0bb1b3b88a561fac07e792699bfd5a07543bcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ↵Xin Li
ours am: cad87045be -s ours am: d6f638e3d5 -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: Ie15c5ea4beec2837fe88dd27da3dd9651b3b8246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada ↵Xin Li
-s ours am: b47aa7524e -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I851e3dc1d25621f5af0cee45042cb7fadfca9682 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s ↵Xin Li
ours am: cad87045be -s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I2ac363c44c52b879d9dad92d3e9012609ebaa7da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9faa32bae9 -s ours am: 8fbbbffada ↵Xin Li
-s ours am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I05d30b6f608781f7023df41d61c92638b7729ee2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3d95aae759 -s oursXin Li
am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: Ib96fac71de0c71f6c20bfdd7bd8e32a8c1c998a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9faa32bae9 -s oursXin Li
am skip reason: Merged-In I713b8fbfa8498c6ed5c8791c88549269bc325eba with SHA-1 87050d55e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2777028 Change-Id: I16915b322efdb021a8f567a09acc485c5b781941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I713b8fbfa8498c6ed5c8791c88549269bc325eba Change-Id: I37d44658fb429bc1172a672eab617f1cf66b4f1a
2023-09-12Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635 ↵Zi Wang
am: f72e4c6707 am: 800c932073 am: 6ee98653ff am: f04b00ab38 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915 Change-Id: I7e130cdb77753b829f84d9d36865b04cebf5957d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: ↵Zi Wang
a2b70c71ac am: d3a3880e41 am: f46653da21 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418 Change-Id: I4bf54a08c5610a97f3e46c08fde16912b547d923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635 ↵Zi Wang
am: f72e4c6707 am: 800c932073 am: 6ee98653ff Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915 Change-Id: I9ec6bdd46b2f98966218b965d223c7a5a33fff85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: ↵Zi Wang
a2b70c71ac am: d3a3880e41 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418 Change-Id: I49bd418d1373907cdb6176b821b97fe78d8a2b66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635 ↵Zi Wang
am: f72e4c6707 am: 800c932073 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915 Change-Id: I734e37c487195adc39db2aa7e500d0d94b8e51dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0 am: ↵Zi Wang
a2b70c71ac Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418 Change-Id: I1868050d59b6d7321a8ad6f2a7a8a3e065e9a8b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635 ↵Zi Wang
am: f72e4c6707 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915 Change-Id: I0be7d027798096e76618566b1bc93846859f9c21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11Add handcrafted libprotobuf-java-full am: bd4496b5ef am: c2a2f405a0Zi Wang
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418 Change-Id: I211e31e84625926aef1269401cf807be18ae9e92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11Merge changes from topic "libprotobuf-java-full" into main am: 9a75a3d635tmp_amf_298295554Zi Wang
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745915 Change-Id: Ibe61c5ae0d0e34e4f408175f4e3df9bb468d9391 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11Add handcrafted libprotobuf-java-full am: bd4496b5efZi Wang
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2745418 Change-Id: I28b16a94db09740a35ca5a1389ea388f750fa4ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11Merge changes from topic "libprotobuf-java-full" into mainZi Wang
* changes: Add filegroup for libprotobuf-java-full java srcs Add handcrafted libprotobuf-java-full
2023-09-07Add filegroup for libprotobuf-java-full java srcsZi Wang
so that we can stop using glob, which causes error when building it. Test: CI Bug: 299290824 Change-Id: I713b8fbfa8498c6ed5c8791c88549269bc325eba
2023-09-07Add handcrafted libprotobuf-java-fullZi Wang
Test: CI Bug: 299290824 Change-Id: I243acbb8b4ad9ae5d498aaa1558f81beeb668693
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: ↵Treehugger Robot
58a2accc85 am: 5393f84e45 am: 78032398ba am: fe21037442 am: 272b4ba300 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254 Change-Id: I83e8a517c6b5aef815627ad6531a3f4693e27880 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: ↵Treehugger Robot
58a2accc85 am: 5393f84e45 am: 78032398ba am: fe21037442 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254 Change-Id: I3d32f8a5275d17cdd06778a2bad20a6c1415cc89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: ↵Treehugger Robot
58a2accc85 am: 5393f84e45 am: 78032398ba Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254 Change-Id: I759386e480f7523c8bfa87ba1bbd61f1ba130808 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: ↵Treehugger Robot
58a2accc85 am: 5393f84e45 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254 Change-Id: I85d97a87d830cb4ed6458fcd1398a9aeadba0906 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into main am: ↵Treehugger Robot
58a2accc85 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2734254 Change-Id: Ib6362eb71175379b3eb9791d2057017889e09569 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01Merge "Add a sentinel Android.bp in external/protobuf/java" into mainTreehugger Robot
2023-08-30Add a sentinel Android.bp in external/protobuf/javaSpandan Das
bp2build will create a proto_library target in the generated BUILD.bazel file so that we can build bazel equivalents of soong modules that use external/protobuf/java as proto.include_dir The alternative would have been to reuse the checked-in external/protobuf/java/BUILD.bazel file, but that would require addressing the following issues - Converting this project to an external workspace for android builds. (e.g. the BUILD files in this directory refer //java/util which is relative to this workspace and not relative to the primary android bazel workspace) - Forking some BUILD.bazel files (we will need export_files for the top-level external/protobuf/Android.bp files) - Importing (or creating shims of) transtive deps like rules_pkg Test: Allowlisted an internal soong module that uses .proto from this dir and verified that a proto_library is created in out/soong/workspace/external/protobuf/java/BUILD.bazel Bug: 290345526 Change-Id: Ic70763ff3583a9c43357c45baac2687c68e6d66d
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 38f21beabc -s ours ↵Xin Li
am: 41871cc5c1 -s ours am: f2bbcccbc4 -s ours am: 7b70041cbc -s ours am skip reason: Merged-In I292cd07db6611b4d5782bee47ba0ca910bd96456 with SHA-1 81a6f6c689 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/24180957 Change-Id: Ib027f7fefc464aae3fc7e9e8706bebe0e7132b34 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-30 12:57:01 +0000