diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-15 21:10:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-15 21:10:51 +0000 |
| commit | c7f1ed0e0f049abf95044e9289922ce459ca62b9 (patch) | |
| tree | 35bd108f71b2b8430a7522baadded2d27fc3f05d | |
| parent | a7b0c2a34645253966c39c9d031d8d4e50d92cdc (diff) | |
| parent | f27cb3dec7ca05f2b7f2da1e4b9f3c56968b5fc6 (diff) | |
| download | libsqlite3-sys-c7f1ed0e0f049abf95044e9289922ce459ca62b9.tar.gz | |
Remove liblibsqlite3_sys_noicu. am: 4b1c87587a am: 59db57b140 am: 8a8ea4e7b3 am: c8f2f420cb am: 7228bfa372 am: f27cb3dec7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/2589225
Change-Id: I0feab0f49ea393f03c2cb3957e3521f854a91e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 26 | ||||
| -rw-r--r-- | cargo2android-extra-module.bp | 20 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
4 files changed, 16 insertions, 55 deletions
@@ -53,6 +53,10 @@ rust_library { "vcpkg", ], shared_libs: ["libsqlite"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], } rust_test { @@ -99,25 +103,3 @@ rust_test { clippy_lints: "none", lints: "none", } - -rust_library { - name: "liblibsqlite3_sys_noicu", - host_supported: true, - crate_name: "libsqlite3_sys", - cargo_env_compat: true, - srcs: [ - "src/lib.rs", - ":libsqlite3_bindgen", - ], - edition: "2018", - features: [ - "default", - "min_sqlite_version_3_6_8", - "pkg-config", - "vcpkg", - ], - static_libs: [ - "libsqlite_static_noicu", - ], -} - diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp deleted file mode 100644 index 8676b74..0000000 --- a/cargo2android-extra-module.bp +++ /dev/null @@ -1,20 +0,0 @@ -rust_library { - name: "liblibsqlite3_sys_noicu", - host_supported: true, - crate_name: "libsqlite3_sys", - cargo_env_compat: true, - srcs: [ - "src/lib.rs", - ":libsqlite3_bindgen", - ], - edition: "2018", - features: [ - "default", - "min_sqlite_version_3_6_8", - "pkg-config", - "vcpkg", - ], - static_libs: [ - "libsqlite_static_noicu", - ], -} diff --git a/cargo2android.json b/cargo2android.json index e901180..edeca5e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,9 +1,10 @@ { - "add-toplevel-block": "cargo2android-extra-module.bp", "copy-out": true, "device": true, "no-pkg-vers": true, "patch": "patches/Android.bp.patch", + "product-available": false, "run": true, - "tests": true + "tests": true, + "vendor-available": false } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index bd57023..5dedfd4 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,8 +1,8 @@ diff --git a/Android.bp b/Android.bp -index 1764165..df125da 100644 +index 8d9ed58..f3b39a3 100644 --- a/Android.bp +++ b/Android.bp -@@ -36,13 +36,6 @@ +@@ -36,13 +36,6 @@ license { ], } @@ -16,7 +16,7 @@ index 1764165..df125da 100644 rust_library { name: "liblibsqlite3_sys", host_supported: true, -@@ -50,7 +43,7 @@ +@@ -50,7 +43,7 @@ rust_library { cargo_env_compat: true, srcs: [ "src/lib.rs", @@ -25,16 +25,16 @@ index 1764165..df125da 100644 ], edition: "2018", features: [ -@@ -59,7 +52,7 @@ +@@ -59,7 +52,7 @@ rust_library { "pkg-config", "vcpkg", ], - shared_libs: ["libsqlite3"], + shared_libs: ["libsqlite"], - } - - rust_test { -@@ -69,7 +62,7 @@ + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", +@@ -75,7 +68,7 @@ rust_test { cargo_env_compat: true, srcs: [ "src/lib.rs", @@ -43,7 +43,7 @@ index 1764165..df125da 100644 ], test_suites: ["general-tests"], auto_gen_config: true, -@@ -83,7 +76,28 @@ +@@ -89,5 +82,26 @@ rust_test { "pkg-config", "vcpkg", ], @@ -71,5 +71,3 @@ index 1764165..df125da 100644 + clippy_lints: "none", + lints: "none", } - - rust_library { |