commit 1526961f36a7132105598abe6f2eea9f627f3001
author Jakob Vukalovic <jakobvukalovic@google.com> Wed Apr 26 16:00:00 2023 +0100
committer Jakob Vukalovic <jakobvukalovic@google.com> Wed May 17 10:26:19 2023 +0100
tree 4e2f811efe227368c58405fdb0dcc3539b591385
parent cf7996958b45884f960c03a2e1473fd3c1b78348

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 873b4d1..a241d18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,7 +33,7 @@
         "trace-pkt",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "liblog_rust",
         "libmanaged",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..46edb51
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 873b4d1..a241d18 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -33,7 +33,7 @@ rust_library {
+         "trace-pkt",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libcfg_if",
+         "liblog_rust",
+         "libmanaged",