diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-11 17:19:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 17:19:14 +0000 |
commit | 5148c4ec37e9530891364e3295b95e8a9d3cc681 (patch) | |
tree | 7fc7062a61d4ae3905c833c46d9c4b3a99c7a6df | |
parent | 68ca71e4407d4eaaf1af5595314a9b33f4523487 (diff) | |
parent | 852b8afbb1999132f4bc5181426d60722ffeabee (diff) | |
download | nix-5148c4ec37e9530891364e3295b95e8a9d3cc681.tar.gz |
Merge "Migrate to cargo_embargo." into main am: 368805870d am: 852b8afbb1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2828066
Change-Id: I71a8f78c8bc55eb0cb48e60ce5f89139539134b6
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 | 8 | ||||
-rw-r--r-- | cargo_embargo.json | 20 |
3 files changed, 21 insertions, 9 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 4045280..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": true, - "device": true, - "features": "event,feature,fs,ioctl,mount,mman,poll,sched,signal,socket,term,time,uio,user", - "min-sdk-version": "29", - "run": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..30b09cd --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,20 @@ +{ + "features": [ + "event", + "feature", + "fs", + "ioctl", + "mount", + "mman", + "poll", + "sched", + "signal", + "socket", + "term", + "time", + "uio", + "user" + ], + "min_sdk_version": "29", + "run_cargo": false +} |