commit 4d61ae78b0f52ae0dd75dd08cc536e8b88da76fb
author Jakob Vukalovic <jakobvukalovic@google.com> Wed Apr 26 13:21:38 2023 +0100
committer Jakob Vukalovic <jakobvukalovic@google.com> Wed May 17 10:20:52 2023 +0100
tree 408168a82ac7c26b5f4d6db75788ad8ae6e15b48
parent 586c65b01582bfcb8d1bf2f31db5a3dcb70be3cf

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 9a97e6d..7ffbbb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,7 @@
         "default",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
     ],
     enabled: false,
     arch: {
@@ -81,7 +81,7 @@
         "default",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
     ],
     apex_available: [
         "//apex_available:platform",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..28fe389
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,22 @@
+diff --git a/Android.bp b/Android.bp
+index 9a97e6d..7ffbbb9 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -58,7 +58,7 @@ rust_test {
+         "default",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+     ],
+     enabled: false,
+     arch: {
+@@ -81,7 +81,7 @@ rust_library {
+         "default",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+     ],
+     apex_available: [
+         "//apex_available:platform",