From 03b74fdb2b6390a89a5571a39c01640fab37f4ec Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 18 Dec 2023 17:27:56 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Id27ca06fa051bffd07dd2aebaa7597155280676f
---
 Android.bp         | 16 +++++++---------
 cargo2android.json | 12 ------------
 cargo_embargo.json | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 8ea87cb..0a99629 100644
--- a/Android.bp
+++ b/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 {
@@ -41,15 +41,13 @@ rust_library {
         "libparking_lot",
         "libprotobuf",
     ],
-    apex_available: [
-        "//apex_available:platform",
-    ],
+    apex_available: ["//apex_available:platform"],
     vendor_available: true,
     min_sdk_version: "29",
     cfgs: [
-            // cfg(soong) is used to distinguish code that only builds on Android, so
-            // that (most of) the same code can be built under both Soong and cargo.
-            "soong",
-    ]
-    ,
+        // cfg(soong) is used to distinguish code that only builds on Android, so
+        // that (most of) the same code can be built under both Soong and cargo.
+        "soong",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c908dd9..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform"
-  ],
-  "device": true,
-  "features": "_secure,boringssl,protobufv3-codec",
-  "min-sdk-version": "29",
-  "run": true,
-  "vendor-available": true,
-  "product-available": false,
-  "add-module-block": "cargo2android_cfgs.bp"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..5d8821e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,17 @@
+{
+  "apex_available": [
+    "//apex_available:platform"
+  ],
+  "features": [
+    "_secure",
+    "boringssl",
+    "protobufv3-codec"
+  ],
+  "min_sdk_version": "29",
+  "package": {
+    "grpcio": {
+      "add_module_block": "cargo2android_cfgs.bp"
+    }
+  },
+  "product_available": false
+}
-- 
cgit v1.2.3