aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-19 10:45:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 10:45:33 +0000
commite578b677f56a056f10cfe4034cb3a7f05c5a0de0 (patch)
tree288035725dd45b79aaa4a79010c5b80fc85eea16
parent8fbe0a93f72ec36af45ed9ca1be910706b1b36eb (diff)
parent0c792fd2b0cf3a2464d7f27d3457425bb348c5e7 (diff)
downloadnix-e578b677f56a056f10cfe4034cb3a7f05c5a0de0.tar.gz
Use libbitflags-1.3.2 am: 0c792fd2b0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2565137 Change-Id: I599ea13f0fac1d5fd6db3e49adf62d0a94af2c36 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 f471209..f44d482 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,7 +67,7 @@ rust_library {
"zerocopy",
],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcfg_if",
"liblibc",
"libmemoffset",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..c7025be
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index f471209..f44d482 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -67,7 +67,7 @@ rust_library {
+ "zerocopy",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcfg_if",
+ "liblibc",
+ "libmemoffset",