From 66d53d7360e4e07d84e688cd116b96ebc8c7d4fb Mon Sep 17 00:00:00 2001
From: Jakob Vukalovic <jakobvukalovic@google.com>
Date: Wed, 26 Apr 2023 15:52:32 +0100
Subject: Use libbitflags-1.3.2

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

Test: Build
Change-Id: If96fa9dee10e4af0aedc8f199e7399a8d4aaf7ed
---
 Android.bp               |  4 ++--
 patches/Android.bp.patch | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 538e284..d111544 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,7 +28,7 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "liblog_rust_nostd",
         "libzerocopy_nostd",
     ],
@@ -54,7 +54,7 @@ rust_test {
     auto_gen_config: true,
     edition: "2018",
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "liblog_rust",
         "libzerocopy",
     ],
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index a89d5a7..8896c52 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,15 +1,26 @@
 diff --git a/Android.bp b/Android.bp
-index 07e10b6..5949f7f 100644
+index f635115..d111544 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -29,8 +29,8 @@ rust_library {
+@@ -28,9 +28,9 @@ rust_library_rlib {
+     srcs: ["src/lib.rs"],
      edition: "2018",
      rustlibs: [
-         "libbitflags",
+-        "libbitflags",
 -        "liblog_rust",
 -        "libzerocopy",
++        "libbitflags-1.3.2",
 +        "liblog_rust_nostd",
 +        "libzerocopy_nostd",
      ],
      apex_available: [
          "//apex_available:platform",
+@@ -54,7 +54,7 @@ rust_test {
+     auto_gen_config: true,
+     edition: "2018",
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "liblog_rust",
+         "libzerocopy",
+     ],
-- 
cgit v1.2.3