Upgrade rust/crates/protobuf-codegen to 2.18.0
* Revert local change, remove patches/*.diff
* Add echo version in post_update.sh
Bug: 170256643
Test: atest -c --include-subdirs external/rust/crates
Test: atest -c --host --include-subdirs external/crosvm
Change-Id: I701b9b2a36f6e8e2ec0a37f47fe85cbb68f2866b
diff --git a/src/customize.rs b/src/customize.rs
index c55fb07..f8e73aa 100644
--- a/src/customize.rs
+++ b/src/customize.rs
@@ -22,6 +22,12 @@
pub serde_derive_cfg: Option<String>,
/// Enable lite runtime
pub lite_runtime: Option<bool>,
+ /// Generate `mod.rs` in the output directory.
+ ///
+ /// This option allows inclusion of generated files from cargo output directory.
+ ///
+ /// This option will likely be on by default in rust-protobuf version 3.
+ pub gen_mod_rs: Option<bool>,
/// Used internally to generate protos bundled in protobuf crate
/// like `descriptor.proto`
pub inside_protobuf: Option<bool>,
@@ -68,6 +74,9 @@
if let Some(v) = that.lite_runtime {
self.lite_runtime = Some(v);
}
+ if let Some(v) = that.gen_mod_rs {
+ self.gen_mod_rs = Some(v);
+ }
if let Some(v) = that.inside_protobuf {
self.inside_protobuf = Some(v);
}
@@ -113,6 +122,8 @@
r.serde_derive_cfg = Some(v.to_owned());
} else if n == "lite_runtime" {
r.lite_runtime = Some(parse_bool(v)?);
+ } else if n == "gen_mod_rs" {
+ r.gen_mod_rs = Some(parse_bool(v)?);
} else if n == "inside_protobuf" {
r.inside_protobuf = Some(parse_bool(v)?);
} else {
@@ -134,6 +145,7 @@
let serde_derive = rustproto::exts::serde_derive.get(source);
let serde_derive_cfg = rustproto::exts::serde_derive_cfg.get(source);
let lite_runtime = None;
+ let gen_mod_rs = None;
let inside_protobuf = None;
Customize {
expose_oneof,
@@ -144,6 +156,7 @@
serde_derive,
serde_derive_cfg,
lite_runtime,
+ gen_mod_rs,
inside_protobuf,
_future_options: (),
}
@@ -159,6 +172,7 @@
let serde_derive = None;
let serde_derive_cfg = None;
let lite_runtime = None;
+ let gen_mod_rs = None;
let inside_protobuf = None;
Customize {
expose_oneof,
@@ -169,6 +183,7 @@
serde_derive,
serde_derive_cfg,
lite_runtime,
+ gen_mod_rs,
inside_protobuf,
_future_options: (),
}
@@ -183,6 +198,7 @@
let serde_derive = rustproto::exts::serde_derive_all.get(source);
let serde_derive_cfg = rustproto::exts::serde_derive_cfg_all.get(source);
let lite_runtime = rustproto::exts::lite_runtime_all.get(source);
+ let gen_mod_rs = None;
let inside_protobuf = None;
Customize {
expose_oneof,
@@ -194,6 +210,7 @@
serde_derive_cfg,
lite_runtime,
inside_protobuf,
+ gen_mod_rs,
_future_options: (),
}
}