diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-11 16:12:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-11 16:12:29 +0000 |
commit | 368805870d33a494270a4d171a170c8e5dab4361 (patch) | |
tree | 7fc7062a61d4ae3905c833c46d9c4b3a99c7a6df | |
parent | 474a9e77411ad1f1684e0120950b195d7bc53a4c (diff) | |
parent | 34237e29e055f8ad5c314eb31ea8aecba9a2d55e (diff) | |
download | nix-368805870d33a494270a4d171a170c8e5dab4361.tar.gz |
Merge "Migrate to cargo_embargo." into main
-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 +} |