Adding variant build _with_serde to protobuf am: f99d362148 am: 1795652794 am: 24fb27ece4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf/+/2368788
Change-Id: I69bcbd979728abebba215a2ff888c7d3aa936ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index cdf6550..03171eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,3 +48,24 @@
],
min_sdk_version: "29",
}
+
+rust_library_host {
+ name: "libprotobuf_with_serde",
+ crate_name: "protobuf",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.27.1",
+ srcs: [
+ "src/lib.rs",
+ ":copy_protobuf_build_out",
+ ],
+ edition: "2018",
+ features: [
+ "serde",
+ "serde_derive",
+ "with-serde",
+ ],
+ rustlibs: [
+ "libserde",
+ ],
+ proc_macros: ["libserde_derive"],
+}
diff --git a/cargo2android.json b/cargo2android.json
index 092efd9..cafe7cd 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -9,6 +9,16 @@
"dependencies": true,
"device": true,
"features": "bytes",
+ "variants": [
+ {
+ "suffix": ""
+ },
+ {
+ "suffix": "_with_serde",
+ "features": "with-serde",
+ "device": false
+ }
+ ],
"min-sdk-version": "29",
"run": true
-}
+}
\ No newline at end of file