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
diff --git a/Android.bp b/Android.bp
index 46b94a4..621a95e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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_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 @@
"src/lib.rs",
":libsqlite3_bindgen",
],
- defaults: ["libsqlite3-sys_defaults"],
+ defaults: ["libsqlite3-sys_test_defaults"],
test_options: {
unit_test: true,
},
@@ -91,12 +93,9 @@
"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 {
