aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-12-11 16:48:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 16:48:03 +0000
commit852b8afbb1999132f4bc5181426d60722ffeabee (patch)
tree7fc7062a61d4ae3905c833c46d9c4b3a99c7a6df
parent474a9e77411ad1f1684e0120950b195d7bc53a4c (diff)
parent368805870d33a494270a4d171a170c8e5dab4361 (diff)
downloadnix-852b8afbb1999132f4bc5181426d60722ffeabee.tar.gz
Merge "Migrate to cargo_embargo." into main am: 368805870d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2828066 Change-Id: I7ae959ee65d26023cab7768117bda34ff03af258 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json20
3 files changed, 21 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 1f8cb07..a6b444a 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 {
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
+}