commit 4af4d955be78e2c9e973daf8d4e7f2131a237b33
author Andrew Walbran <qwandor@google.com> Tue Dec 05 16:38:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 05 16:38:09 2023 +0000
tree 5b8f6d934520f205ebf8aa8afe699e30fa8b4b1c
parent b7c4621252ee50ac8a382e74128df0f385438730
parent 7994f86262472e091f2d344bbf9b71b199525894

Migrate to cargo_embargo. am: 7994f86262

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf/+/2856056

Change-Id: I2dbbe3b6225c4b10646c7b1497b9dfc67d4af0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2.27.1/Android.bp

diff --git a/2.27.1/Android.bp b/2.27.1/Android.bp
index 668cc98..35d072b 100644
--- a/2.27.1/Android.bp
+++ b/2.27.1/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -29,7 +29,6 @@
 
 rust_library {
     name: "libprotobuf_deprecated",
-    // has rustc warnings
     host_supported: true,
     crate_name: "protobuf",
     cargo_env_compat: true,
@@ -40,9 +39,7 @@
     ],
     edition: "2018",
     features: ["bytes"],
-    rustlibs: [
-        "libbytes",
-    ],
+    rustlibs: ["libbytes"],
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",

2.27.1/cargo2android.json

diff --git a/2.27.1/cargo2android.json b/2.27.1/cargo2android.json
deleted file mode 100644
index 17fe98a..0000000
--- a/2.27.1/cargo2android.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "copy-out": true,
-  "dependencies": true,
-  "device": true,
-  "features": "bytes",
-  "variants": [
-    {
-      "suffix": ""
-    },
-    {
-      "suffix": "_with_serde",
-      "features": "with-serde",
-      "device": false
-    }
-  ],
-  "min-sdk-version": "29",
-  "run": true,
-  "name-suffix": "_deprecated"
-}

2.27.1/cargo_embargo.json

diff --git a/2.27.1/cargo_embargo.json b/2.27.1/cargo_embargo.json
new file mode 100644
index 0000000..1d2e6c8
--- /dev/null
+++ b/2.27.1/cargo_embargo.json
@@ -0,0 +1,21 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "features": [
+    "bytes"
+  ],
+  "min_sdk_version": "29",
+  "module_name_overrides": {
+    "copy_protobuf_build_out": "copy_protobuf_deprecated_build_out",
+    "libprotobuf": "libprotobuf_deprecated"
+  },
+  "package": {
+    "protobuf": {
+      "copy_out": true
+    }
+  }
+}