Snap for 11097608 from 3ba9cc63ea0fb8f8468331557e1ce726af4c7166 to 24Q1-release

Change-Id: I84c50822d232c9fc52fd74ed9bcb4a23b211b845

Android.bp

diff --git a/Android.bp b/Android.bp
index 12dffa7..ac04d75 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 {
@@ -60,9 +60,7 @@
         "libc",
         "stock-zlib",
     ],
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     shared_libs: ["libz"],
     apex_available: [
         "//apex_available:platform",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index adb04b1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f3c0ef8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}