From 5c8770fe848dc7583f3167f92c8467fbb23efdb1 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 9 Nov 2023 13:36:01 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I22203a32e0e8c4baa281f99831feff2f7f822240
---
 Android.bp         | 10 +++-------
 cargo2android.json |  5 -----
 cargo_embargo.json |  4 ++++
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 6dbf830..7937a8e 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 {
@@ -45,9 +45,7 @@ rust_library {
     cargo_pkg_version: "0.1.2",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "liblinked_hash_map",
-    ],
+    rustlibs: ["liblinked_hash_map"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -69,7 +67,5 @@ rust_test {
         unit_test: true,
     },
     edition: "2015",
-    rustlibs: [
-        "liblinked_hash_map",
-    ],
+    rustlibs: ["liblinked_hash_map"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "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..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3