From 247db62d4bb3fbb588e0bee3674b62c345845f63 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Tue, 14 Nov 2023 14:59:16 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I5d2d07ed2c392c33dac0b20e5ec90fc40d2ca5da
---
 Android.bp         |  6 ++----
 cargo2android.json | 11 -----------
 cargo_embargo.json |  9 +++++++++
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 06c2d2f..0cf269e 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 {
@@ -46,9 +46,7 @@ rust_library {
     srcs: ["src/lib.rs"],
     edition: "2018",
     cfgs: ["has_const_fn_trait_bound"],
-    rustlibs: [
-        "libscopeguard",
-    ],
+    rustlibs: ["libscopeguard"],
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index da746ae..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.virt"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f3c0ef8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}
-- 
cgit v1.2.3