commit 66feee4f88654436929e62dc30f9eb1ab12360cb
author Jakob Vukalovic <jakobvukalovic@google.com> Fri May 19 13:11:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 19 13:11:50 2023 +0000
tree 288035725dd45b79aaa4a79010c5b80fc85eea16
parent 2b415e735c652f4f857cbdf3b68d99ed1d6453da
parent 77cec5d31670f354d1c2e5d44b63aeb76a1457fa

Use libbitflags-1.3.2 am: 0c792fd2b0 am: e578b677f5 am: 052bf6d8d8 am: 77cec5d316

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2565137

Change-Id: I8fad37eae679919e9b1a8b981a2a41e531efc9c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index f471209..f44d482 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,7 +67,7 @@
         "zerocopy",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "liblibc",
         "libmemoffset",

patches/Android.bp.diff

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",