From e499062798794f4a1cfcb363ff510db35f4e036d Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Tue, 14 Nov 2023 18:30:10 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I337173708db7ea3ef70ea9506e3294f2a96b7af9
---
 Android.bp         | 31 +++++++++++++++----------------
 cargo2android.json |  8 --------
 cargo_embargo.json |  4 ++++
 3 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 096603c..5cdb0a9 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 {
@@ -54,35 +54,34 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "pin-utils_test_defaults",
-    crate_name: "pin_utils",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    rustlibs: [
-        "libpin_utils",
-    ],
-}
-
 rust_test {
     name: "pin-utils_test_tests_projection",
-    defaults: ["pin-utils_test_defaults"],
     host_supported: true,
+    crate_name: "projection",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.0",
     srcs: ["tests/projection.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: ["libpin_utils"],
 }
 
 rust_test {
     name: "pin-utils_test_tests_stack_pin",
-    defaults: ["pin-utils_test_defaults"],
     host_supported: true,
+    crate_name: "stack_pin",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.0",
     srcs: ["tests/stack_pin.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: ["libpin_utils"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e9ed115..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "vendor-available": true,
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..db1aaad
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "min_sdk_version": "29",
+  "tests": true
+}
-- 
cgit v1.2.3