commit 0e1a037893f9029b04e7bf66ce1f84c73aeae33c
author Jakob Vukalovic <jakobvukalovic@google.com> Thu May 18 17:50:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 18 17:50:54 2023 +0000
tree 288035725dd45b79aaa4a79010c5b80fc85eea16
parent c3321949d75b5f5bf9ee4bfda4d8016137ca59ce
parent 7d7d6b1b864f59139bad9bed64193786e1367bfe

Use libbitflags-1.3.2 am: 7d7d6b1b86

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

Change-Id: Ie2b27bb7266366e2b88712b848ccc5cf2003380a
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",