From 59d61a5fc01fb0b5c66dfcd51ce0d57265f38e30 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 13 Nov 2023 17:25:42 +0000
Subject: Migrate to cargo_embargo.

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

diff --git a/Android.bp b/Android.bp
index 1aa08ab..39be20a 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 {
@@ -52,9 +52,7 @@ rust_library {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
@@ -81,7 +79,5 @@ rust_test {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b8ed541
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3