commit 571ded103262acdb87c1d41b568068135934ba5c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:33:16 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 08 04:33:16 2023 +0000
tree 7badcaeed26ba87fd1dcd7bb51792a7b4d9f07c7
parent 2eae40b925ac627ba72b1c2c03cd6ce90c93f730
parent 47d7610eb2f9ecef0be012e3b144b49fca4585cf

Snap for 10460766 from 47d7610eb2f9ecef0be012e3b144b49fca4585cf to mainline-healthfitness-release

Change-Id: I57138e23987aef062fd805e1d38b5229cfb1c726

Android.bp

diff --git a/Android.bp b/Android.bp
index 85c5cd5..0ece701 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,7 @@
     features: ["unstable_boringssl"],
     cfgs: ["boringssl", "soong"],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "libbssl_ffi",
         "libforeign_types",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index 9f7b012..ef0ab4f 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -1,5 +1,5 @@
 diff --git a/Android.bp b/Android.bp
-index 2282c66..4e9011c 100644
+index 6628b2a..0ece701 100644
 --- a/Android.bp
 +++ b/Android.bp
 @@ -54,11 +54,11 @@ rust_library {
@@ -9,7 +9,8 @@
 -    cfgs: ["boringssl"],
 +    cfgs: ["boringssl", "soong"],
      rustlibs: [
-         "libbitflags",
+-        "libbitflags",
++        "libbitflags-1.3.2",
          "libcfg_if",
 -        "libopenssl_sys",
 +        "libbssl_ffi",