From ffdb11873f159ff4ad25361d5d9d019f7033a74c Mon Sep 17 00:00:00 2001 From: Jakob Vukalovic Date: Tue, 16 May 2023 15:15:10 +0100 Subject: 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: Ie9c4680d23aa447ad62b2b10fd72e0866d6faf56 Merged-In: I1f3fac21ba0f3067e4ade394a61cedbafe51ed7c --- Android.bp | 2 +- patches/Android.bp.diff | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 patches/Android.bp.diff diff --git a/Android.bp b/Android.bp index 51830a3..ca704b4 100644 --- a/Android.bp +++ b/Android.bp @@ -31,7 +31,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..34d5397 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,13 @@ +diff --git a/Android.bp b/Android.bp +index 51830a3..ca704b4 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -31,7 +31,7 @@ rust_library { + "trace", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + "libfallible_iterator", + "libfallible_streaming_iterator", + "libhashlink", -- cgit v1.2.3