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
(cherry picked from https://android-review.googlesource.com/q/commit:4561abffe16e8982295726bef4d8c52fc4cbb36e)
Merged-In: Idbd10a9f755018f01c89ba06d1c8137bfdd5a3e2
Change-Id: Idbd10a9f755018f01c89ba06d1c8137bfdd5a3e2
diff --git a/Android.bp b/Android.bp
index a20fffb..36ba6ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,7 @@
"parser",
],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
"libcriterion",
"liblibc",
],
@@ -82,7 +82,7 @@
],
rustlibs: [
"libanes",
- "libbitflags",
+ "libbitflags-1.3.2",
"libcriterion",
"liblibc",
],
@@ -101,7 +101,7 @@
"parser",
],
rustlibs: [
- "libbitflags",
+ "libbitflags-1.3.2",
],
apex_available: [
"//apex_available:platform",
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..72a6503
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,31 @@
+diff --git a/Android.bp b/Android.bp
+index a20fffb..36ba6ab 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -57,7 +57,7 @@ rust_test {
+ "parser",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcriterion",
+ "liblibc",
+ ],
+@@ -82,7 +82,7 @@ rust_test {
+ ],
+ rustlibs: [
+ "libanes",
+- "libbitflags",
++ "libbitflags-1.3.2",
+ "libcriterion",
+ "liblibc",
+ ],
+@@ -101,7 +101,7 @@ rust_library {
+ "parser",
+ ],
+ rustlibs: [
+- "libbitflags",
++ "libbitflags-1.3.2",
+ ],
+ apex_available: [
+ "//apex_available:platform",
