commit efeaca3d360cbc4a3247e574891a1791e07de255
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:23:53 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:23:53 2023 +0000
tree 616745ced4b278691a01f837c969292bc6ddee06
parent f71ce3aa739102829272e26e2ee9b4cdd66ecc63
parent 3a9961e41fcf9c8759c80c9ff14c433bb7d3a371

Snap for 10453563 from 3a9961e41fcf9c8759c80c9ff14c433bb7d3a371 to mainline-tzdata5-release

Change-Id: Ic483aca34bdb9de3aa89b5919d8d6296d6d5ee52

Android.bp

diff --git a/Android.bp b/Android.bp
index b1133c8..c5f37ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,7 @@
     edition: "2018",
     features: ["default"],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libcfg_if",
         "liblibc",
         "libnix",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..d7c81bc
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 69d9cb2..02cdcf2 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -47,7 +47,7 @@ rust_library {
+     edition: "2018",
+     features: ["default"],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libcfg_if",
+         "liblibc",
+         "libnix",