Snap for 11084970 from c1a7517bf1ce2770ba1f367f5ce4376bb72ca8f9 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: I8dabc671799aac45c37496f60c43de4c70f84fe7

3 files changed, 19 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 0322aed..862240c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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_host {
     name: "libvm_memory_android",
     crate_name: "vm_memory",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8889327..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "features": "default,backend-bitmap,backend-mmap,backend-atomic,arc-swap",
-  "name-suffix": "_android",
-  "run": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..087fd61
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,18 @@
+{
+  "features": [
+    "default",
+    "backend-bitmap",
+    "backend-mmap",
+    "backend-atomic",
+    "arc-swap"
+  ],
+  "module_name_overrides": {
+    "libvm_memory": "libvm_memory_android"
+  },
+  "package": {
+    "vm-memory": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false
+}