From 7e679ee12490fed110ef519053b0428570da1348 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 23 Oct 2023 12:24:51 +0100
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Run cargo_embargo, compared Android.bp.
Change-Id: Ifdc503a123ba827f36a243eb667f45849e3347f2
---
 Android.bp         | 48 +++++++++++++++++++++++++++---------------------
 cargo2android.json |  9 ---------
 cargo_embargo.json |  8 ++++++++
 3 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 4db0331..e29c94a 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 {
@@ -56,18 +56,21 @@ rust_test {
         "libloading",
         "loaded",
     ],
-    rustlibs: [
-        "liblibloading",
-    ],
+    rustlibs: ["liblibloading"],
 }
 
-rust_defaults {
-    name: "ash_test_defaults",
-    crate_name: "ash",
+rust_test {
+    name: "ash_test_tests_constant_size_arrays",
+    host_supported: true,
+    crate_name: "constant_size_arrays",
     cargo_env_compat: true,
     cargo_pkg_version: "0.37.3+1.3.251",
+    srcs: ["tests/constant_size_arrays.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2021",
     features: [
         "debug",
@@ -81,24 +84,29 @@ rust_defaults {
     ],
 }
 
-rust_test {
-    name: "ash_test_tests_constant_size_arrays",
-    defaults: ["ash_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/constant_size_arrays.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
     name: "ash_test_tests_display",
-    defaults: ["ash_test_defaults"],
     host_supported: true,
+    crate_name: "display",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.37.3+1.3.251",
     srcs: ["tests/display.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2021",
+    features: [
+        "debug",
+        "default",
+        "libloading",
+        "loaded",
+    ],
+    rustlibs: [
+        "libash_rust",
+        "liblibloading",
+    ],
 }
 
 rust_library {
@@ -116,9 +124,7 @@ rust_library {
         "libloading",
         "loaded",
     ],
-    rustlibs: [
-        "liblibloading",
-    ],
+    rustlibs: ["liblibloading"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e516e0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "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..15db1a5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "tests": true,
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false
+}
-- 
cgit v1.2.3