diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-14 01:38:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 01:38:06 +0000 |
| commit | acc7271e91357e14cd1fe2686d8b15d8e76333a9 (patch) | |
| tree | 6a36bed96881815537e91852ee8571498859bfdb | |
| parent | 06650417bcbe6718ff9e5d3ed7e2b9c5fceabf30 (diff) | |
| parent | d94ed6936c03901d54722d7d4e4c7993113834e1 (diff) | |
| download | userfaultfd-acc7271e91357e14cd1fe2686d8b15d8e76333a9.tar.gz | |
Cleanup cargo2android configs and patches am: 050c5507ac am: d94ed6936c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/userfaultfd/+/2750726
Change-Id: I3244691c2157ea24406b833ae5b3e943cd8ad37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/cargo2android.json b/cargo2android.json index cc57004..1d152ce 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,7 @@ { - "device": true, - "run": true + "device": true, + "run": true, + "dep-suffixes": { + "bitflags": "-1.3.2" + } } diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index d7c81bc..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 69d9cb2..02cdcf2 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -47,7 +47,7 @@ rust_library { - edition: "2018", - features: ["default"], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcfg_if", - "liblibc", - "libnix", |