1diff --git a/Android.bp b/Android.bp 2index 1764165..df125da 100644 3--- a/Android.bp 4+++ b/Android.bp 5@@ -36,13 +36,6 @@ 6 ], 7 } 8 9-genrule { 10- name: "copy_libsqlite3-sys_build_out", 11- srcs: ["out/*"], 12- cmd: "cp $(in) $(genDir)", 13- out: ["bindgen.rs"], 14-} 15- 16 rust_library { 17 name: "liblibsqlite3_sys", 18 host_supported: true, 19@@ -50,7 +43,7 @@ 20 cargo_env_compat: true, 21 srcs: [ 22 "src/lib.rs", 23- ":copy_libsqlite3-sys_build_out", 24+ ":libsqlite3_bindgen", 25 ], 26 edition: "2018", 27 features: [ 28@@ -59,7 +52,7 @@ 29 "pkg-config", 30 "vcpkg", 31 ], 32- shared_libs: ["libsqlite3"], 33+ shared_libs: ["libsqlite"], 34 } 35 36 rust_test { 37@@ -69,7 +62,7 @@ 38 cargo_env_compat: true, 39 srcs: [ 40 "src/lib.rs", 41- ":copy_libsqlite3-sys_build_out", 42+ ":libsqlite3_bindgen", 43 ], 44 test_suites: ["general-tests"], 45 auto_gen_config: true, 46@@ -83,7 +76,28 @@ 47 "pkg-config", 48 "vcpkg", 49 ], 50- shared_libs: ["libsqlite3"], 51+ shared_libs: ["libsqlite"], 52+} 53+ 54+rust_bindgen { 55+ name: "libsqlite3_bindgen", 56+ host_supported: true, 57+ crate_name: "sqlite3_bindgen", 58+ custom_bindgen: "sqlite3_bindgen_build", 59+ wrapper_src: "wrapper.h", 60+ source_stem: "bindgen", 61+ cflags: ["-I external/sqlite/dist"], 62+ defaults: ["sqlite-defaults"], 63+} 64+ 65+rust_test { 66+ name: "libsqlite3_bindgen_test", 67+ srcs: [":libsqlite3_bindgen"], 68+ crate_name: "sqlite3_bindgen_test", 69+ test_suites: ["general-tests"], 70+ auto_gen_config: true, 71+ clippy_lints: "none", 72+ lints: "none", 73 } 74 75 rust_library { 76