aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-05-15 19:42:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-15 19:42:25 +0000
commitc4eceeeca9c1d8a666ef8cc688821a0b14848b9c (patch)
treecf7a6075592de9587a44077f855a875b0e2a545e
parent9f718db152c65cef0f6eaac5d5e1b29ac1278542 (diff)
parent3393c5f7e85859d6e9eaa32ea91f1fd1ec9097cd (diff)
downloadrusqlite-c4eceeeca9c1d8a666ef8cc688821a0b14848b9c.tar.gz
Remove librusqlite_noicu am: 04b40c0114 am: 776b5d47dd am: 285f80445a am: 3393c5f7e8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2589085 Change-Id: Ie6c627f3dc28fa5d4de64fe80036814e14453de5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp23
-rw-r--r--cargo2android-extra-module.bp21
-rw-r--r--cargo2android.json7
3 files changed, 4 insertions, 47 deletions
diff --git a/Android.bp b/Android.bp
index c0ca574..51830a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,26 +43,3 @@ rust_library {
"//apex_available:anyapex",
],
}
-
-rust_library {
- name: "librusqlite_noicu",
- host_supported: true,
- crate_name: "rusqlite",
- cargo_env_compat: true,
- srcs: ["src/lib.rs"],
- edition: "2018",
- features: [
- "modern_sqlite",
- "trace",
- ],
- rustlibs: [
- "libbitflags",
- "libfallible_iterator",
- "libfallible_streaming_iterator",
- "libhashlink",
- "liblibsqlite3_sys_noicu",
- "libmemchr",
- "libsmallvec",
- ],
-}
-
diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp
deleted file mode 100644
index 33222cb..0000000
--- a/cargo2android-extra-module.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-rust_library {
- name: "librusqlite_noicu",
- host_supported: true,
- crate_name: "rusqlite",
- cargo_env_compat: true,
- srcs: ["src/lib.rs"],
- edition: "2018",
- features: [
- "modern_sqlite",
- "trace",
- ],
- rustlibs: [
- "libbitflags",
- "libfallible_iterator",
- "libfallible_streaming_iterator",
- "libhashlink",
- "liblibsqlite3_sys_noicu",
- "libmemchr",
- "libsmallvec",
- ],
-}
diff --git a/cargo2android.json b/cargo2android.json
index b515003..93f9280 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
{
- "add-toplevel-block": "cargo2android-extra-module.bp",
"device": true,
"features": "modern_sqlite,trace",
- "run": true
-} \ No newline at end of file
+ "product-available": false,
+ "run": true,
+ "vendor-available": false
+}