commit 272acb5b28ec4fbb2c0694b95c94d102bdca524a
author Andrew Walbran <qwandor@google.com> Fri Nov 17 14:22:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 17 14:22:43 2023 +0000
tree 6fd9d20a8536f5f4d0a8316c0e24ce5b3ba39c24
parent 308c941f21a4d9a4bf66f64c811b91237922c2e6
parent 53c720ca331c8bc16be6d8f6736cbec620be2272

Migrate to cargo_embargo. am: 661173923d am: 53c720ca33

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/2836456

Change-Id: I2d81d15512e88d4f1e90cf82bd96d7fb4748a4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 68c54b6..1ba86d6 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 {
@@ -57,7 +57,6 @@
 
 rust_library {
     name: "libvulkano",
-    // has rustc warnings
     host_supported: true,
     crate_name: "vulkano",
     cargo_env_compat: true,

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9a5297d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "copy-out": true,
-  "device": true,
-  "no-presubmit": true,
-  "run": true,
-  "tests": false,
-  "features": ""
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1f59f23
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [],
+  "package": {
+    "vulkano": {
+      "copy_out": true,
+      "no_presubmit": true
+    }
+  }
+}