diff options
| author | Ravi Jain <raviajain@google.com> | 2023-05-15 06:49:17 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-05-15 06:49:17 +0000 |
| commit | ef30d3cc7489e3766c2c212efe53ebec4e0b3740 (patch) | |
| tree | 14c6c3385baa889a57ea8ebb629a4f1d8fb2434e | |
| parent | b60629996e3f19c4ae3e5fcd155b7d68dd710cf3 (diff) | |
| parent | 87e8fc48e37f4206cecd33f54509354c7d4239a5 (diff) | |
| download | rusqlite-ef30d3cc7489e3766c2c212efe53ebec4e0b3740.tar.gz | |
[automerge] Revert "Use libbitflags-1.3.2" 2p: 87e8fc48e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/23215388
Change-Id: I9cd4b2f5a83513ddad01f83c0693f5b05e80fbb4
| -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, 3 insertions, 25 deletions
@@ -31,7 +31,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", @@ -56,7 +56,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp index e0c0fcf..33222cb 100644 --- a/cargo2android-extra-module.bp +++ b/cargo2android-extra-module.bp @@ -10,7 +10,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 53b87f1..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,22 +0,0 @@ -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", |