| --- Android.bp 2021-04-14 17:32:44.882379059 +0000 |
| +++ Android.bp 2021-04-14 17:33:25.765957305 +0000 |
| @@ -40,7 +40,10 @@ |
| crate_name: "libsqlite3_sys", |
| cargo_env_compat: true, |
| cargo_pkg_version: "0.22.2", |
| - srcs: ["src/lib.rs"], |
| + srcs: [ |
| + "src/lib.rs", |
| + ":libsqlite3_bindgen", |
| + ], |
| edition: "2018", |
| features: [ |
| "default", |
| @@ -48,13 +51,14 @@ |
| "pkg-config", |
| "vcpkg", |
| ], |
| - shared_libs: ["libsqlite3"], |
| + shared_libs: [ |
| + "libsqlite", |
| + ], |
| } |
| |
| rust_defaults { |
| name: "libsqlite3-sys_test_defaults", |
| crate_name: "libsqlite3_sys", |
| - srcs: ["src/lib.rs"], |
| test_suites: ["general-tests"], |
| auto_gen_config: true, |
| edition: "2018", |
| @@ -64,11 +68,17 @@ |
| "pkg-config", |
| "vcpkg", |
| ], |
| - shared_libs: ["libsqlite3"], |
| + shared_libs: [ |
| + "libsqlite", |
| + ], |
| } |
| |
| rust_test_host { |
| name: "libsqlite3-sys_host_test_src_lib", |
| + srcs: [ |
| + "src/lib.rs", |
| + ":libsqlite3_bindgen", |
| + ], |
| defaults: ["libsqlite3-sys_test_defaults"], |
| test_options: { |
| unit_test: true, |
| @@ -77,10 +87,30 @@ |
| |
| rust_test { |
| name: "libsqlite3-sys_device_test_src_lib", |
| + srcs: [ |
| + "src/lib.rs", |
| + ":libsqlite3_bindgen", |
| + ], |
| defaults: ["libsqlite3-sys_test_defaults"], |
| } |
| |
| -Errors in cargo.out: |
| -error: linking with `cc` failed: exit status: 1 |
| -error: aborting due to previous error |
| -error: could not compile `libsqlite3-sys` |
| +rust_bindgen { |
| + name: "libsqlite3_bindgen", |
| + host_supported: true, |
| + crate_name: "sqlite3_bindgen", |
| + custom_bindgen: "sqlite3_bindgen_build", |
| + wrapper_src: "wrapper.h", |
| + source_stem: "bindgen", |
| + cflags: ["-I external/sqlite/dist"], |
| + defaults: ["sqlite-defaults"], |
| +} |
| + |
| +rust_test { |
| + name: "libsqlite3_bindgen_test", |
| + srcs: [":libsqlite3_bindgen"], |
| + crate_name: "sqlite3_bindgen_test", |
| + test_suites: ["general-tests"], |
| + auto_gen_config: true, |
| + clippy_lints: "none", |
| + lints: "none", |
| +} |