Snap for 10975086 from 0b41cc97f8b4a80c53a1c207986387f3d9e0e19b to 24Q1-release

Change-Id: I93c33645d2781fce549022bed8a981ea9482627f

3 files changed, 19 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 929d46b..60e4e8e 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 185661c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "features": "channel,default,io,memchr,sink",
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..892125c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,18 @@
+{
+  "tests": true,
+  "features": [
+    "channel",
+    "default",
+    "io",
+    "memchr",
+    "sink"
+  ],
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}