commit 7d7d6b1b864f59139bad9bed64193786e1367bfe
author Jakob Vukalovic <jakobvukalovic@google.com> Wed Apr 26 15:57:57 2023 +0100
committer Jakob Vukalovic <jakobvukalovic@google.com> Wed May 17 10:26:54 2023 +0100
tree 288035725dd45b79aaa4a79010c5b80fc85eea16
parent a67abce652ce6259344bbdf58da69d6b19837b42

Use libbitflags-1.3.2

This updates Android.bp to still use the old version of libbitflags instead
of the most recent version. Also add a patch file for Android.bp which
ensures version 1.3.2 is still used after an update.

Test: Build
Change-Id: Idad820129faa85e99b4a556aa031c852b4761441

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