aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Vukalovic <jakobvukalovic@google.com>2023-05-19 12:29:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-19 12:29:10 +0000
commit395600a8fd94632c449b6c170733c6e48e984520 (patch)
tree717a38a968d6a0699d6a43346d61eb0f1c0c2091
parent3393c5f7e85859d6e9eaa32ea91f1fd1ec9097cd (diff)
parentb50d3c34786c0404b2a4602f3af831de2042ae28 (diff)
downloadrusqlite-395600a8fd94632c449b6c170733c6e48e984520.tar.gz
Use libbitflags-1.3.2 am: ffdb11873f am: 4f942b9e54 am: b50d3c3478
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2563164 Change-Id: Ibfd57fb11e718c20301bc3fccaedc1fe0bbd3a0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 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",