From 61a44d920a9e1afd3cd5e48bccb759e2c38ae475 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 17 Nov 2023 12:17:05 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I5802a3726df0c3d3fdfb045f6f150f0c94445ad1
---
 Android.bp         |  8 ++------
 cargo2android.json | 13 -------------
 cargo_embargo.json | 10 ++++++++++
 3 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 4900f04..4aaab98 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 {
@@ -20,7 +20,6 @@ license {
 
 rust_library {
     name: "libuntrusted",
-    // has rustc warnings
     host_supported: true,
     crate_name: "untrusted",
     cargo_env_compat: true,
@@ -40,7 +39,6 @@ rust_library {
 
 rust_test {
     name: "untrusted_test_tests_tests",
-    // has rustc warnings
     host_supported: true,
     crate_name: "tests",
     cargo_env_compat: true,
@@ -52,7 +50,5 @@ rust_test {
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libuntrusted",
-    ],
+    rustlibs: ["libuntrusted"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 506d866..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
-  "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..2718013
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}
-- 
cgit v1.2.3