Snap for 11097608 from 4f88d1688c1b9f9a90d1c5c447c889006ea55f50 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ie1378d5ed47d89a30a50ea9f342802d4be15c916

3 files changed, 15 insertions, 15 deletions

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"
+      }
+    }
+  ]
+}