diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-08-24 20:13:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-24 20:13:10 +0000 |
| commit | 9a24ab9b2912c9c4afbcb51505f29354780eaad7 (patch) | |
| tree | 3e9c0c7dd3a6c6cac548ee5612296577fe158484 | |
| parent | 0a474501f29d0b0a3fdf6f9131353c983c93d184 (diff) | |
| parent | 9223ff8027f9a17f4bd10c3ed40ff8929d69b96c (diff) | |
| download | libsqlite3-sys-9a24ab9b2912c9c4afbcb51505f29354780eaad7.tar.gz | |
Merge "Improve Android.bp" am: 2b84311aea am: d2c41c6094 am: 9223ff8027
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/1806615
Change-Id: I893f61d8481fb640a07106a18366de55aa8ea1d9
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 17 |
3 files changed, 19 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --dependencies --test --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. // We renamed the shared_libs dependence from libsqlite3 to libsqlite. @@ -40,6 +40,8 @@ rust_library { name: "liblibsqlite3_sys", host_supported: true, crate_name: "libsqlite3_sys", + cargo_env_compat: true, + cargo_pkg_version: "0.22.2", srcs: [ "src/lib.rs", ":libsqlite3_bindgen", @@ -57,7 +59,7 @@ rust_library { } rust_defaults { - name: "libsqlite3-sys_defaults", + name: "libsqlite3-sys_test_defaults", crate_name: "libsqlite3_sys", test_suites: ["general-tests"], auto_gen_config: true, @@ -79,7 +81,7 @@ rust_test_host { "src/lib.rs", ":libsqlite3_bindgen", ], - defaults: ["libsqlite3-sys_defaults"], + defaults: ["libsqlite3-sys_test_defaults"], test_options: { unit_test: true, }, @@ -91,12 +93,9 @@ rust_test { "src/lib.rs", ":libsqlite3_bindgen", ], - defaults: ["libsqlite3-sys_defaults"], + defaults: ["libsqlite3-sys_test_defaults"], } -// dependent_library ["feature_list"] -// pkg-config-0.3.19 - rust_bindgen { name: "libsqlite3_bindgen", host_supported: true, diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..3362132 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,6 @@ +{ + "device": true, + "patch": "patches/Android.bp.patch", + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 0b9b65e..dd2c339 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,9 +1,9 @@ --- Android.bp 2021-04-14 17:32:44.882379059 +0000 +++ Android.bp 2021-04-14 17:33:25.765957305 +0000 @@ -40,7 +40,10 @@ - name: "liblibsqlite3_sys", - host_supported: true, crate_name: "libsqlite3_sys", + cargo_env_compat: true, + cargo_pkg_version: "0.22.2", - srcs: ["src/lib.rs"], + srcs: [ + "src/lib.rs", @@ -23,7 +23,7 @@ } rust_defaults { - name: "libsqlite3-sys_defaults", + name: "libsqlite3-sys_test_defaults", crate_name: "libsqlite3_sys", - srcs: ["src/lib.rs"], test_suites: ["general-tests"], @@ -45,10 +45,10 @@ + "src/lib.rs", + ":libsqlite3_bindgen", + ], - defaults: ["libsqlite3-sys_defaults"], + defaults: ["libsqlite3-sys_test_defaults"], test_options: { unit_test: true, -@@ -77,13 +87,23 @@ +@@ -77,10 +87,20 @@ rust_test { name: "libsqlite3-sys_device_test_src_lib", @@ -56,14 +56,11 @@ + "src/lib.rs", + ":libsqlite3_bindgen", + ], - defaults: ["libsqlite3-sys_defaults"], + defaults: ["libsqlite3-sys_test_defaults"], } - // dependent_library ["feature_list"] - // pkg-config-0.3.19 - -Errors in cargo.out: --error: linking with `cc` failed: exit code: 1 +-error: linking with `cc` failed: exit status: 1 -error: aborting due to previous error -error: could not compile `libsqlite3-sys` +rust_bindgen { |