diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-05-11 14:23:35 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-05-11 14:23:35 +0000 |
| commit | b60629996e3f19c4ae3e5fcd155b7d68dd710cf3 (patch) | |
| tree | ad603d48b3e79c73f01ef350f287d1f0ae344090 | |
| parent | 9f718db152c65cef0f6eaac5d5e1b29ac1278542 (diff) | |
| parent | 8119d54bfd216154af776cdbc4ed6d08b45c53be (diff) | |
| download | rusqlite-b60629996e3f19c4ae3e5fcd155b7d68dd710cf3.tar.gz | |
[automerge] Use libbitflags-1.3.2 2p: 8119d54bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/23170224
Change-Id: Idaac009cab87badfb75491046e746d13b0b66d5b
Merged-In: Ie9c4680d23aa447ad62b2b10fd72e0866d6faf56
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android-extra-module.bp | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 22 |
3 files changed, 25 insertions, 3 deletions
@@ -31,7 +31,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", @@ -56,7 +56,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp index 33222cb..e0c0fcf 100644 --- a/cargo2android-extra-module.bp +++ b/cargo2android-extra-module.bp @@ -10,7 +10,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..53b87f1 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,22 @@ +diff --git a/Android.bp b/Android.bp +index c0ca574..9de5ea6 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", +@@ -56,7 +56,7 @@ rust_library { + "trace", + ], + rustlibs: [ +- "libbitflags", ++ "libbitflags-1.3.2", + "libfallible_iterator", + "libfallible_streaming_iterator", + "libhashlink", |