Rust protobuf 2->3: Update cuttlefish
tldr: remove protobuf2 from Android Rust and upgrade everything to pb3.
These commits update:
- The grpcio rust crate to use protobuf 3
- The build system to always use the new libprotobuf (pb3) instead of the _deprecated variant (for pb2); they also force-enable libprotobuf everywhere, ignoring the use_protobuf3 flag, removes the tests related to pb2
- The following modules, which required syntax changes:
-- packages/modules/Bluetooth
-- device/google/cuttlefish
-- vendor/auto
Bug: 308790516
Test: m rust
Ignore-AOSP-First: must be done in main to upgrade cuttlefish+vendor with the rest all at once
Change-Id: I719bce106b19eed834430ef85ec92dad5e515d55
diff --git a/host/commands/secure_env/rust/Android.bp b/host/commands/secure_env/rust/Android.bp
index 176430e..0d7df9a 100644
--- a/host/commands/secure_env/rust/Android.bp
+++ b/host/commands/secure_env/rust/Android.bp
@@ -23,6 +23,7 @@
protos: ["storage.proto"],
source_stem: "kmr_proto",
host_supported: true,
+ use_protobuf3: true,
}
rust_library_host {
@@ -38,7 +39,7 @@
"libkmr_wire",
"liblibc",
"liblog_rust",
- "libprotobuf_deprecated",
+ "libprotobuf",
"libsecure_env_tpm",
],
defaults: ["cuttlefish_buildhost_only"],
@@ -71,7 +72,7 @@
"libkmr_wire",
"liblibc",
"liblog_rust",
- "libprotobuf_deprecated",
+ "libprotobuf",
"libsecure_env_tpm",
],
defaults: ["cuttlefish_buildhost_only"],
