diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-18 16:19:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-18 16:19:31 +0000 |
commit | 046f1fb756d70b0ec46f739af359b8c8992b67c6 (patch) | |
tree | 4302d6741f5304fc6d37021c22f8bb44595f0c66 | |
parent | f7dd78510c2045ab0e2760881c4290268122f50e (diff) | |
parent | 08283ba53f83d9fb0c7592b6e8da256ae087b95c (diff) | |
download | merge_derive-046f1fb756d70b0ec46f739af359b8c8992b67c6.tar.gz |
Migrate to cargo_embargo. am: 08283ba53f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2877376
Change-Id: I49ead1ac23000a0d6101c2daff50887a33be9a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 3 | ||||
-rw-r--r-- | cargo_embargo.json | 8 |
3 files changed, 9 insertions, 4 deletions
@@ -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 { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 1be49f0..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..0742578 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "package": { + "merge_derive": { + "device_supported": false + } + }, + "run_cargo": false +} |