Snap for 11097608 from 90fa860d7cc113af40466de84be8c0847ace93e2 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r28android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I7ff22ee26fe9540e558ece1e81d82f6601ca9afe

3 files changed, 12 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 13b6346..e83f278 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,11 +1,8 @@
-// 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.
 
-
-
 rust_library {
     name: "libtracing_subscriber",
-    // has rustc warnings
     host_supported: true,
     crate_name: "tracing_subscriber",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 77581cf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "features": "alloc,std,smallvec,parking_lot,fmt,registry"
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c9709e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "features": [
+    "alloc",
+    "std",
+    "smallvec",
+    "parking_lot",
+    "fmt",
+    "registry"
+  ],
+  "run_cargo": false
+}