commit 34d3546c25442b4989885ba169a6949d6da25c92
author Andrew Walbran <qwandor@google.com> Wed Dec 06 19:46:39 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 06 19:46:39 2023 +0000
tree 9c58ecc53b7de4e2c2f00abebc37fbd7a2ed8a29
parent b89304060ebee814e01afe47a5a09845f6ee6377
parent f41a4d0d53fa7925dc244df8d4ad78498ead3d24

Migrate to cargo_embargo. am: f41a4d0d53

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

Change-Id: I39dbbb58e23b0edf93e00fa1b72966e0b13ea878
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 e705500..1466182 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 {
@@ -27,11 +27,7 @@
     cargo_pkg_version: "2.27.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "libprotobuf_deprecated",
-    ],
-    product_available: true,
-    vendor_available: true,
+    rustlibs: ["libprotobuf_deprecated"],
 }
 
 rust_test_host {
@@ -46,9 +42,7 @@
         unit_test: true,
     },
     edition: "2015",
-    rustlibs: [
-        "libprotobuf_deprecated",
-    ],
+    rustlibs: ["libprotobuf_deprecated"],
 }
 
 rust_binary_host {
@@ -59,9 +53,7 @@
     srcs: ["src/bin/protoc-gen-rust.rs"],
     edition: "2015",
     rustlibs: [
-        "libprotobuf_deprecated",
         "libprotobuf_codegen_deprecated",
+        "libprotobuf_deprecated",
     ],
-    product_available: true,
-    vendor_available: true,
 }

2.27.1/cargo2android.json

diff --git a/2.27.1/cargo2android.json b/2.27.1/cargo2android.json
deleted file mode 100644
index de731c4..0000000
--- a/2.27.1/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "run": true,
-  "tests": true,
-  "name-suffix": "_deprecated",
-  "dep-suffixes": {
-    "protobuf": "_deprecated",
-    "protobuf_codegen": "_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..14de05c
--- /dev/null
+++ b/2.27.1/cargo_embargo.json
@@ -0,0 +1,18 @@
+{
+  "module_blocklist": [
+    "protobuf_bin_gen_rust_do_not_use"
+  ],
+  "module_name_overrides": {
+    "libprotobuf": "libprotobuf_deprecated",
+    "libprotobuf_codegen": "libprotobuf_codegen_deprecated",
+    "protobuf-codegen_test_src_lib": "protobuf-codegen_deprecated_test_src_lib",
+    "protoc_gen_rust": "protoc-gen-rust-deprecated"
+  },
+  "package": {
+    "protobuf-codegen": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false,
+  "tests": true
+}