Snap for 11086585 from 98af750a10d408e738840cc685337ed0d6295081 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: Id3803480b87b59fb4b68dcd0fc4a2b16887f232b

3 files changed, 14 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 841b4e1..12d95c4 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 {
@@ -51,9 +51,7 @@ rust_library {
         "getrandom",
         "std",
     ],
-    rustlibs: [
-        "libgetrandom",
-    ],
+    rustlibs: ["libgetrandom"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -80,7 +78,5 @@ rust_test {
         "getrandom",
         "std",
     ],
-    rustlibs: [
-        "libgetrandom",
-    ],
+    rustlibs: ["libgetrandom"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8945bb0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "features": "std",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d308ca2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "std"
+  ],
+  "run_cargo": false,
+  "tests": true
+}