commit 3fb4f89cf4e4526309c2555a01877e214929fd3b
author Jakob Vukalovic <jakobvukalovic@google.com> Wed Apr 26 13:33:45 2023 +0100
committer Jakob Vukalovic <jakobvukalovic@google.com> Wed May 17 10:23:55 2023 +0100
tree 91d16e073ae7410f627ac8f80e91e426f221ab6a
parent ee3a3df8ebf080d01b723922bc2535fd48eb203a

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: I505fc05afa9c9a16c60e2504caadc450bbf604f9

Android.bp

diff --git a/Android.bp b/Android.bp
index fd57489..86a6c71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,7 @@
         "which-rustfmt",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcexpr",
         "libclang_sys",
         "liblazy_static",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..0e9e66e
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index fd57489..86a6c71 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -56,7 +56,7 @@ rust_library_host {
+         "which-rustfmt",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libcexpr",
+         "libclang_sys",
+         "liblazy_static",