From 46be28a61ca82f1ff019f76f1334a14dfaf9406e Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 13 Nov 2023 17:24:03 +0000
Subject: Migrate to cargo_embargo.

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

diff --git a/Android.bp b/Android.bp
index e05e052..edcf56c 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: "libtracing",
-    // has rustc warnings
     host_supported: true,
     crate_name: "tracing",
     cargo_env_compat: true,
@@ -49,7 +48,6 @@ rust_library {
 
 rust_library {
     name: "libtracing_max_level_off",
-    // has rustc warnings
     host_supported: true,
     crate_name: "tracing",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4131f2e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "run": true,
-  "device": true,
-  "variants": [
-    {
-    },
-    {
-      "features": "max_level_off",
-      "suffix": "_max_level_off"
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..188aefd
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+  "run_cargo": false,
+  "variants": [
+    {},
+    {
+      "features": [
+        "max_level_off"
+      ],
+      "module_name_overrides": {
+        "libtracing": "libtracing_max_level_off"
+      }
+    }
+  ]
+}
-- 
cgit v1.2.3