aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 7a577a77531ba5cdca830fc4435064ecdd7262f5 to sc-v2-releaseandroid-build-team Robot
Change-Id: I5fa67687c73c28071cf49315d9e9139af55407ad
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d87f0a6cce -s ↵Xin Li
ours am: 11f195cb70 -s ours am skip reason: Change-Id I4d05f82f3afd759a2178f0fc03f7ce7d475df44b with SHA-1 ec513965ba is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5c314e9a6ab7911b57bdd5636f968a42bb54e52
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d87f0a6cce -s oursXin Li
am skip reason: Change-Id I4d05f82f3afd759a2178f0fc03f7ce7d475df44b with SHA-1 ec513965ba is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I78ebd6c7428c6920bbb8c13dddd6cc866d1b1430
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I4d05f82f3afd759a2178f0fc03f7ce7d475df44b Change-Id: Ic640d2b5f27bbe10cd180917aa30ae09316f85ae
2021-02-11Snap for 7137523 from a7e18248e5692497df0bcb7b2dca5edcdee87d95 to sc-v2-releaseandroid-build-team Robot
Change-Id: I6caff231ef22b0e4f6655ff305bf03317d25457c
2021-02-09Backport null pointer check from upstreamColin Cross
Backport [1] from upstream to avoid a null pointer dereference. [1] https://github.com/protocolbuffers/protobuf/commit/32e5deb1ac76feb4f187371c2a7f76c9009b1eff#diff-9ac2dd60c731243464677560177e2552aaf5fb4301333d475ed039343f36d63f Bug: 179161711 Test: mmma external/protobuf Change-Id: I3b0c272317675956043c92adbf99ed3042f222d6 Merged-In: I3b0c272317675956043c92adbf99ed3042f222d6 (cherry picked from commit 2cc88998253443703a2c16d6f24775689eea49d8)
2021-02-05Snap for 7125381 from 21a9fa709b5f3ca3ec2999cf826d77c436bf2389 to sc-v2-releaseandroid-build-team Robot
Change-Id: If2add5a7ad3cbbf494a847a41d9c54a3f1cd91f5
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aa am: a96e494136 am: ↵Treehugger Robot
cfb573f73d Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1573263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9669c1d15d3f5b78c645704ab9c032ccbcc674cc
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aa am: a96e494136Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1573263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I83a8fa8734f713340c7b3023d19b3e3be9d9e897
2021-02-04Merge "Fix license_type. Contains GPL" am: 759defa9aaTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1573263 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4783867fa779006a0a50caf95af12c62246cdd33
2021-02-04Merge "Fix license_type. Contains GPL"android-s-preview-1Treehugger Robot
2021-02-03Fix license_type. Contains GPLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Exempt-From-Owner-Approval: janitorial work Change-Id: Ie037bee36edb81ae58b720d4a63ec02687d72950
2021-01-29Snap for 7110204 from 372190fcad91cf60378f4bdba8cb0ec3a72e49c3 to sc-v2-releaseandroid-build-team Robot
Change-Id: I7bad5d65f4b7e3f0c7d29e9d41a38ee68ab750d5
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: ↵Josh Gao
90b1479488 am: 98ac85aed1 am: 3b0264b34b Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1561257 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3db40beb869037da04448f52fcbd548aea879465
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: ↵Josh Gao
90b1479488 am: 98ac85aed1 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1561257 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I63761409ab866655f4b5260fcd919b23656ce042
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available.""" am: 90b1479488Josh Gao
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1561257 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie702b933978a9ee217ea5bf1d6c7be2b8fd1480c
2021-01-28Merge "Revert "Revert "Make protobuf vendor_ramdisk_available."""Josh Gao
2021-01-28Revert "Revert "Make protobuf vendor_ramdisk_available.""Josh Gao
This reverts commit 6ba74e49d91e19b4d2724f96d4e4e4f0edb702b4. Exempt-From-Owner-Approval: reland of revert Test: treehugger Change-Id: If3ece9647d7f7c3aeaf3fd1e6889055e97add4a0
2021-01-28Snap for 7107824 from 586b45b9f6f52a26369daa43d002f6b12c436f12 to sc-v2-releaseandroid-build-team Robot
Change-Id: Iee33e36d71d79eb9ce6f6b5aa22f3d704cad6a2b
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00 am: 6080d4e1fe am: ↵Treehugger Robot
9f481f1f7b Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1556649 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65894d1a0d8257ff5f5c9f22d92ca86e04a26bc4
2021-01-27Snap for 7105071 from b36f61b2f3697bb1d72394848a83ad9f499c925c to sc-v2-releaseandroid-build-team Robot
Change-Id: Ibe9b060e8689a95594e8225754b1fc859f1aef94
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00 am: 6080d4e1feTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1556649 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4334302da805e7aeef2bce0091fb139cbfedc9e1
2021-01-27Merge "Fix license_type. BSD is NOTICE" am: f1d1875a00Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1556649 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec5f7a723ab047810dcb48b0b95a8c77cdcf27e
2021-01-26Merge "Fix license_type. BSD is NOTICE"Treehugger Robot
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580c am: ↵Jerome Gaillard
8fe44b3874 am: 2dd8e8af9b Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1560036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72139b694661314dd8989e7cdfb76668f6a06769
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580c am: ↵Jerome Gaillard
8fe44b3874 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1560036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib79901ec83a77e9252d70e179be18e14b097d664
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available."" am: e767ba580cJerome Gaillard
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1560036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7f68960143eab2eaf4977677be46204da658ec0
2021-01-26Merge "Revert "Make protobuf vendor_ramdisk_available.""Jerome Gaillard
2021-01-26Revert "Make protobuf vendor_ramdisk_available."Jerome Gaillard
Revert "tombstoned: switch from goto to RAII." Revert "Let crash_dump read /proc/$PID." Revert submission 1556807-tombstone_proto Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug Reverted Changes: Ide6811297:tombstoned: switch from goto to RAII. I8d285c4b4:tombstoned: make it easier to add more types of ou... Id0f0fa285:tombstoned: support for protobuf fds. I6be6082ab:Let crash_dump read /proc/$PID. Id812ca390:Make protobuf vendor_ramdisk_available. Ieeece6e6d:libdebuggerd: add protobuf implementation. Change-Id: I23d2c8ca8b12f0ad553aa3eb939ae7d1dea9c154
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224 am: ↵Josh Gao
e65431bd43 am: e534c9cb35 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1551267 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e87f71e8acc602d588af133fc1a5f3ba0f1b872
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224 am: e65431bd43Josh Gao
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1551267 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic05ef882e55ec7d18bb8258101e78de637b3b590
2021-01-25Merge "Make protobuf vendor_ramdisk_available." am: caf5303224Josh Gao
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1551267 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff79f0c156f62b9090046dd6357379c59ad45cf5
2021-01-25Merge "Make protobuf vendor_ramdisk_available."Josh Gao
2021-01-21Fix license_type. BSD is NOTICEBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I5018dbd0adc23cb45dea4ab6b6ca45118441d6de
2021-01-14Make protobuf vendor_ramdisk_available.Josh Gao
Test: treehugger Change-Id: Id812ca390e13600e06219a93b2c98239a63cd7d4
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: b4330cc2d8 am: c45645eddf ↵Treehugger Robot
am: 551efee2cb Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1538732 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8fc0e186ff8edfb865ceec6c92d68e845fd7e9e
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: b4330cc2d8 am: c45645eddfTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1538732 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0c09648655a029f37c20e764a1e8c32c759f7a31
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: b4330cc2d8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1538732 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58a4a49f79250345508a469ca808b08b052b5d01
2021-01-06Merge "Add assemble_cvd to com.android.virt"Treehugger Robot
2021-01-05Add assemble_cvd to com.android.virtJiyong Park
assemble_cvd directly or indirectly depends on these modules. To add assemble_cvd to the com.anroid.virt APEX, these modules are marked as being available to the APEX. Bug: 174639526 Test: m com.android.virt Change-Id: I6d68e275a3f7a73918bebf396b6fe732f206e1cf
2020-11-25Merge "Add product_available to product available modules" am: c47584bfd3 ↵Treehugger Robot
am: 6d5d8eaccb am: ec513965ba Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1495982 Change-Id: I8df9bebdc395584488f43370c78ac9a1ff029c90
2020-11-25Merge "Add product_available to product available modules" am: c47584bfd3 ↵Treehugger Robot
am: 6d5d8eaccb Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1495982 Change-Id: I4d05f82f3afd759a2178f0fc03f7ce7d475df44b
2020-11-25Merge "Add product_available to product available modules" am: c47584bfd3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1495982 Change-Id: I24648d6161327ad36087f8c056f5e573176a6adb
2020-11-25Merge "Add product_available to product available modules"Treehugger Robot
2020-11-24Mark ab/6881855 as merged am: 89183ce09a am: 20d4e0d9e9Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/13112789 Change-Id: Ie719a54549aa7f48495a3935995e09ae5f57e401
2020-11-24Mark ab/6881855 as merged am: 89183ce09aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/13112789 Change-Id: Ie68d3ecebaf18c778f6685b33edc34491a2909c7
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iaf7d5cf939e4e583abe1896d4d095b7f9734b5a5
2020-11-11Add product_available to product available modulesJustin Yun
vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: I528eb83ca79fccdc2c27f7a8b118c0e9c29a379d
2020-11-02[automerger skipped] Move most protoc sources to libprotoc am: 0f300e3980 -s ↵Colin Cross
ours am skip reason: Change-Id I00a6efd1f9865299c03ef84b09adffa46eab7a0f with SHA-1 6b13c3603d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12737277 Change-Id: Ia577553f2be609ca1a9fcc9196be848c06e0629f
2020-10-14Move most protoc sources to libprotocandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseColin Cross
Match the library layout in the BUILD file by moving most of the protoc sources into libprotoc and leaving only main.cc in aprotoc. Bug: 151768015 Test: m checkbuild Change-Id: I00a6efd1f9865299c03ef84b09adffa46eab7a0f Merged-In: I00a6efd1f9865299c03ef84b09adffa46eab7a0f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 21:58:12 +0000