Use libbitflags-1.3.2
This updates Android.bp to still use the old version of libbitflags instead
of the most recent version. Also add a patch file for Android.bp which
ensures version 1.3.2 is still used after an update.
Test: Build
Change-Id: I26d2e8190bebbf5ad36ade2b2b36ddf840293fde
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",
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",
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",
