Merge 334bffd57e838707206b2ab8ca5a809d0248b485 on remote branch
Change-Id: Ie1ee50b17cf89abe53ca3e9d53ef7c224e4bc5c8
diff --git a/Android.bp b/Android.bp
index 1d265d8..9f055dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,6 @@
host_supported: true,
crate_name: "libsqlite3_sys",
cargo_env_compat: true,
- cargo_pkg_version: "0.22.2",
srcs: [
"src/lib.rs",
":libsqlite3_bindgen",
@@ -53,47 +52,31 @@
"pkg-config",
"vcpkg",
],
- shared_libs: [
- "libsqlite",
- ],
-}
-
-rust_defaults {
- name: "libsqlite3-sys_test_defaults",
- crate_name: "libsqlite3_sys",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- features: [
- "default",
- "min_sqlite_version_3_6_8",
- "pkg-config",
- "vcpkg",
- ],
- 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,
- },
+ shared_libs: ["libsqlite"],
}
rust_test {
- name: "libsqlite3-sys_device_test_src_lib",
+ name: "libsqlite3-sys_test_src_lib",
+ host_supported: true,
+ crate_name: "libsqlite3_sys",
+ cargo_env_compat: true,
srcs: [
"src/lib.rs",
":libsqlite3_bindgen",
],
- defaults: ["libsqlite3-sys_test_defaults"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2018",
+ features: [
+ "default",
+ "min_sqlite_version_3_6_8",
+ "pkg-config",
+ "vcpkg",
+ ],
+ shared_libs: ["libsqlite"],
}
rust_bindgen {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d87563d..a952140 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,7 +8,21 @@
"name": "legacykeystore_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "libsqlite3-sys_test_src_lib"
+ },
+ {
+ "name": "libsqlite3_bindgen_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libsqlite3-sys_test_src_lib"
},
{
"name": "libsqlite3_bindgen_test"
diff --git a/cargo2android.json b/cargo2android.json
index 530205a..e901180 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,9 @@
{
+ "add-toplevel-block": "cargo2android-extra-module.bp",
+ "copy-out": true,
"device": true,
+ "no-pkg-vers": true,
"patch": "patches/Android.bp.patch",
"run": true,
- "tests": true,
- "copy-out": true,
- "add-toplevel-block": "cargo2android-extra-module.bp"
+ "tests": true
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 0928aa0..bd57023 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,7 +2,9 @@
index 1764165..df125da 100644
--- a/Android.bp
+++ b/Android.bp
-@@ -38,9 +38,2 @@ license {
+@@ -36,13 +36,6 @@
+ ],
+ }
-genrule {
- name: "copy_libsqlite3-sys_build_out",
@@ -12,49 +14,42 @@
-}
-
rust_library {
-@@ -53,3 +46,3 @@ rust_library {
+ name: "liblibsqlite3_sys",
+ host_supported: true,
+@@ -50,7 +43,7 @@
+ cargo_env_compat: true,
+ srcs: [
"src/lib.rs",
- ":copy_libsqlite3-sys_build_out",
+ ":libsqlite3_bindgen",
],
-@@ -62,3 +55,5 @@ rust_library {
+ edition: "2018",
+ features: [
+@@ -59,7 +52,7 @@
+ "pkg-config",
+ "vcpkg",
],
- shared_libs: ["libsqlite3"],
-+ shared_libs: [
-+ "libsqlite",
-+ ],
++ shared_libs: ["libsqlite"],
}
-@@ -68,8 +63,2 @@ rust_defaults {
- crate_name: "libsqlite3_sys",
-- srcs: [
-- "src/lib.rs",
+
+ rust_test {
+@@ -69,7 +62,7 @@
+ cargo_env_compat: true,
+ srcs: [
+ "src/lib.rs",
- ":copy_libsqlite3-sys_build_out",
-- ],
-- cargo_env_compat: true,
-- cargo_pkg_version: "0.22.2",
++ ":libsqlite3_bindgen",
+ ],
test_suites: ["general-tests"],
-@@ -83,3 +72,5 @@ rust_defaults {
+ auto_gen_config: true,
+@@ -83,7 +76,28 @@
+ "pkg-config",
+ "vcpkg",
],
- shared_libs: ["libsqlite3"],
-+ shared_libs: [
-+ "libsqlite",
-+ ],
- }
-@@ -88,2 +79,6 @@ rust_test_host {
- name: "libsqlite3-sys_host_test_src_lib",
-+ srcs: [
-+ "src/lib.rs",
-+ ":libsqlite3_bindgen",
-+ ],
- defaults: ["libsqlite3-sys_test_defaults"],
-@@ -96,3 +91,28 @@ rust_test {
- name: "libsqlite3-sys_device_test_src_lib",
-+ srcs: [
-+ "src/lib.rs",
-+ ":libsqlite3_bindgen",
-+ ],
- defaults: ["libsqlite3-sys_test_defaults"],
- }
++ shared_libs: ["libsqlite"],
++}
+
+rust_bindgen {
+ name: "libsqlite3_bindgen",
@@ -75,4 +70,6 @@
+ auto_gen_config: true,
+ clippy_lints: "none",
+ lints: "none",
-+}
+ }
+
+ rust_library {