aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-19 14:10:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 14:10:27 +0000
commit3a88b6155de274ff731e8bd2b4abc3de24ec9812 (patch)
tree616745ced4b278691a01f837c969292bc6ddee06
parente9224f1ec417fd8eb4b3d965d1a27c14fed0196e (diff)
parente5734b8bd1277a67cc9025a69ee33b94ad68125e (diff)
downloaduserfaultfd-3a88b6155de274ff731e8bd2b4abc3de24ec9812.tar.gz
Use libbitflags-1.3.2 am: b6e056415a am: 1adbc81030 am: b02a74be8e am: a0e1414b76 am: e5734b8bd1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/userfaultfd/+/2563221 Change-Id: I87855ff5b0b96d6a4da330d7b43adb3ab8b205c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff13
2 files changed, 14 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index b1133c8..c5f37ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,7 @@ rust_library {
edition: "2018",
features: ["default"],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcfg_if",
"liblibc",
"libnix",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..d7c81bc
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+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",