commit ec942e6bd96bc18c6aa47b17bbd5c2fe28a92398
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:33:04 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:33:04 2023 +0000
tree 288035725dd45b79aaa4a79010c5b80fc85eea16
parent ac225c0801fbf7122fa327f436a04158d0d256c3
parent 7d7d6b1b864f59139bad9bed64193786e1367bfe

Snap for 10460766 from 7d7d6b1b864f59139bad9bed64193786e1367bfe to mainline-healthfitness-release

Change-Id: Id6b90be7b0b979c078366a12424266a2f99d58b0

Android.bp

diff --git a/Android.bp b/Android.bp
index f471209..f44d482 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,7 +67,7 @@
         "zerocopy",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "liblibc",
         "libmemoffset",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..c7025be
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index f471209..f44d482 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -67,7 +67,7 @@ rust_library {
+         "zerocopy",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libcfg_if",
+         "liblibc",
+         "libmemoffset",