commit aa6d48d4a5b6f09c9513f403c45d14fb1e3220a6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:20:22 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:20:22 2023 +0000
tree 023dd32e3b28457d86f866764c19e619196c684f
parent 343a41de66ab5117380fc6c2aa39bc553e8ad9e3
parent 46c83e0266cf762268a276eba75d7871f040a945

Snap for 10453563 from 46c83e0266cf762268a276eba75d7871f040a945 to mainline-tzdata5-release

Change-Id: I96b9dd6e91364462c5484aa6a0613ff1240745cd

3.2.23/Android.bp

diff --git a/3.2.23/Android.bp b/3.2.23/Android.bp
index b37cf33..db4e9eb 100644
--- a/3.2.23/Android.bp
+++ b/3.2.23/Android.bp
@@ -49,7 +49,7 @@
     edition: "2021",
     features: ["std"],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libclap_lex",
         "libindexmap",
         "libtextwrap",

Android.bp

diff --git a/Android.bp b/Android.bp
index 235586c..1595d5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,7 @@
         "usage",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libclap_lex",
         "libonce_cell",
     ],
@@ -82,7 +82,7 @@
         "usage",
     ],
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "libclap",
         "libclap_lex",
         "libonce_cell",

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..a4dc389
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,22 @@
+diff --git a/Android.bp b/Android.bp
+index 235586c..1595d5e 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -53,7 +53,7 @@ rust_library {
+         "usage",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libclap_lex",
+         "libonce_cell",
+     ],
+@@ -82,7 +82,7 @@ rust_binary {
+         "usage",
+     ],
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "libclap",
+         "libclap_lex",
+         "libonce_cell",