commit 3a9961e41fcf9c8759c80c9ff14c433bb7d3a371
author Jakob Vukalovic <jakobvukalovic@google.com> Wed Apr 26 14:44:12 2023 +0100
committer Jakob Vukalovic <jakobvukalovic@google.com> Wed May 17 10:28:21 2023 +0100
tree 616745ced4b278691a01f837c969292bc6ddee06
parent 2d5ff96e0781f2c657c2d9d1830223c7a98d6713

Use libbitflags-1.3.2

This updates Android.bp to still use the old version of libbitflags instead
of the most recent version.

Test: Build
Change-Id: Iba3f549c62526d31c58f94bd6eec9d0af426ab2c

Android.bp

diff --git a/Android.bp b/Android.bp
index b1133c8..c5f37ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,7 @@
     edition: "2018",
     features: ["default"],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "liblibc",
         "libnix",

patches/Android.bp.diff

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