aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-16 15:15:10 +0100
committerJakob Vukalovic <jakobvukalovic@google.com>2023-05-17 10:27:48 +0100
commit048f509b989d65e59578f2e70bf3b55470c43632 (patch)
tree551d464c08f582e18853edf08239fe3b74bbfbc3
parent87e8fc48e37f4206cecd33f54509354c7d4239a5 (diff)
downloadrusqlite-048f509b989d65e59578f2e70bf3b55470c43632.tar.gz
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: I1f3fac21ba0f3067e4ade394a61cedbafe51ed7c
-rw-r--r--Android.bp2
-rw-r--r--patches/Android.bp.diff13
2 files changed, 14 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index c0ca574..3e4e03c 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",