Snap for 11097608 from 25cd99f8dc7bc5b77d40b909f0c02b933044a47b 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_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I7c51ec080a01188b8b9a66ab555d2a5da819308d

3 files changed, 19 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index f148121..b5e9625 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 {
@@ -49,9 +49,7 @@ rust_library {
         "serde",
         "std",
     ],
-    rustlibs: [
-        "libserde",
-    ],
+    rustlibs: ["libserde"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f441aa9..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "no-host": true,
-  "run": true,
-  "features": "default,std,serde"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a2ca437
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,17 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "default",
+    "std",
+    "serde"
+  ],
+  "package": {
+    "semver": {
+      "host_supported": false
+    }
+  },
+  "run_cargo": false
+}