diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 22:04:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 22:04:31 +0000 |
| commit | 00c920eae0d7744e3f660fa1b60fda0ca14efedf (patch) | |
| tree | 6a36bed96881815537e91852ee8571498859bfdb | |
| parent | 88e94f871a838a22969def56196714c2b74bd826 (diff) | |
| parent | 6ea07c715676057297796b6ef193071679b87832 (diff) | |
| download | userfaultfd-00c920eae0d7744e3f660fa1b60fda0ca14efedf.tar.gz | |
Snap for 10843824 from 6ea07c715676057297796b6ef193071679b87832 to 24Q1-release
Change-Id: Ia752d6b50e5e04e069033373119e617abf47715a
| -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", |