aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 15:28:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 15:28:44 +0000
commite6f6c6e57f72f6b5c93f273820becae5e5878f48 (patch)
treeb0fd52d0f7a127840f8fadc1bd36140bc10c562a
parent8b75e7e9116600a5082af15b0c7dc22497abdab1 (diff)
parent7d7876e4581478493b580ed60f339225d3baba04 (diff)
downloadvm-memory-e6f6c6e57f72f6b5c93f273820becae5e5878f48.tar.gz
Migrate to cargo_embargo. am: 7d7876e458
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vm-memory/+/2824631 Change-Id: I76eebf577f0edceee5b510f87024918e0d65c319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json18
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
+}