commit e5f43d93fdeabda363c075725f91c0e78c442f2b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:34:05 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:34:05 2023 +0000
tree 551d464c08f582e18853edf08239fe3b74bbfbc3
parent 9f718db152c65cef0f6eaac5d5e1b29ac1278542
parent 048f509b989d65e59578f2e70bf3b55470c43632

Snap for 10460766 from 048f509b989d65e59578f2e70bf3b55470c43632 to mainline-healthfitness-release

Change-Id: Ibe291a11b964de1e1f4b6a65d696347942ecffbb

Android.bp

diff --git a/Android.bp b/Android.bp
index c0ca574..3e4e03c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,7 @@
         "trace",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libfallible_iterator",
         "libfallible_streaming_iterator",
         "libhashlink",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..34d5397
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 51830a3..ca704b4 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -31,7 +31,7 @@ rust_library {
+         "trace",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libfallible_iterator",
+         "libfallible_streaming_iterator",
+         "libhashlink",