commit c41feb0932d4b5fab7adeffa84ed894e3a3bc25b
author Ludovic Barman <ludovicb@google.com> Wed Dec 20 15:27:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 20 15:27:57 2023 +0000
tree 8d0d24383d04631b4cea5fc78123732be005bbfb
parent 0ac69e8ba364303e392e733d8addd9b3acb43978
parent 6f86b6031cff1afd1bb03b064dd16749bfc1b5f7

Merge "Remove unused use_protobuf3 flag" into main

fsverity/Android.bp

diff --git a/fsverity/Android.bp b/fsverity/Android.bp
index 93b4d93..ce3b499 100644
--- a/fsverity/Android.bp
+++ b/fsverity/Android.bp
@@ -44,7 +44,6 @@
     name: "libfsverity_digests_proto_rust",
     crate_name: "fsverity_digests_proto",
     source_stem: "fsverity_digests_proto",
-    use_protobuf3: true,
     protos: [
         "fsverity_digests.proto",
     ],

ondevice-signing/proto/Android.bp

diff --git a/ondevice-signing/proto/Android.bp b/ondevice-signing/proto/Android.bp
index 6b1e35f..356e661 100644
--- a/ondevice-signing/proto/Android.bp
+++ b/ondevice-signing/proto/Android.bp
@@ -37,7 +37,6 @@
     crate_name: "odsign_proto",
     protos: ["odsign_info.proto"],
     source_stem: "odsign_proto",
-    use_protobuf3: true,
     host_supported: true,
     apex_available: [
         "com.android.compos",