commit c90b5b652445996a7fc924b941052c38304932e1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 15 00:14:48 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 15 00:14:48 2023 +0000
tree 2408a87941b39f46b4cb2cbec30b2765d3d4805c
parent 64696c60382d3da344e36673256c9a79edf63c50
parent 7c42c1a7fe595ad8a60a015eb5918cb9c05cb205

Snap for 11097608 from 7c42c1a7fe595ad8a60a015eb5918cb9c05cb205 to 24Q1-release

Change-Id: I91edc68f6a110343896a5b2bf16df8858d7cd05b

Android.bp

diff --git a/Android.bp b/Android.bp
index 8b0ce37..2c49229 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: "libvirtio_vsock",
     crate_name: "virtio_vsock",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4241aa2..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "run": true,
-  "dep-suffixes": {
-    "vm_memory": "_android"
-  }
-}
\ No newline at end of file

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..7edff07
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "module_name_overrides": {
+    "libvm_memory": "libvm_memory_android"
+  },
+  "package": {
+    "virtio-vsock": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false
+}