aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 13:50:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 13:50:23 +0000
commit2f2119d6477cc8a2a9ab1db627da46f53aa1403f (patch)
tree6fd9d20a8536f5f4d0a8316c0e24ce5b3ba39c24
parent570756a04768fc2386894881b59e5c1921a717d0 (diff)
parent661173923dac9b1e909afabafe353c3d6736a9d7 (diff)
downloadvulkano-2f2119d6477cc8a2a9ab1db627da46f53aa1403f.tar.gz
Migrate to cargo_embargo. am: 661173923d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/2836456 Change-Id: I7814ee755d3ca8ffe2f5f96e7eddabc3634a571b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json13
3 files changed, 14 insertions, 14 deletions
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 @@ genrule {
rust_library {
name: "libvulkano",
- // has rustc warnings
host_supported: true,
crate_name: "vulkano",
cargo_env_compat: true,
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": ""
-}
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
+ }
+ }
+}