Migrate to cargo_embargo. am: 629a2c0c68 am: f0c228d962
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/2832423
Change-Id: I7d4189846153168f131ca2d9131d3e9235df4517
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index fda9c2a..4c0da1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
// We renamed the shared_libs dependence from libsqlite3 to libsqlite.
@@ -41,6 +41,7 @@
host_supported: true,
crate_name: "libsqlite3_sys",
cargo_env_compat: true,
+ cargo_pkg_version: "0.22.2",
srcs: [
"src/lib.rs",
":libsqlite3_bindgen",
@@ -64,6 +65,7 @@
host_supported: true,
crate_name: "libsqlite3_sys",
cargo_env_compat: true,
+ cargo_pkg_version: "0.22.2",
srcs: [
"src/lib.rs",
":libsqlite3_bindgen",
diff --git a/bindgen_modules.bp b/bindgen_modules.bp
new file mode 100644
index 0000000..cd5b85e
--- /dev/null
+++ b/bindgen_modules.bp
@@ -0,0 +1,20 @@
+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",
+}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index edeca5e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "copy-out": true,
- "device": true,
- "no-pkg-vers": true,
- "patch": "patches/Android.bp.patch",
- "product-available": false,
- "run": true,
- "tests": true,
- "vendor-available": false
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..adebce2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,12 @@
+{
+ "package": {
+ "libsqlite3-sys": {
+ "add_toplevel_block": "bindgen_modules.bp",
+ "patch": "patches/Android.bp.patch"
+ }
+ },
+ "product_available": false,
+ "run_cargo": false,
+ "tests": true,
+ "vendor_available": false
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 5dedfd4..0101559 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,73 +1,44 @@
diff --git a/Android.bp b/Android.bp
-index 8d9ed58..f3b39a3 100644
+index f36d4cd..4c0da1d 100644
--- a/Android.bp
+++ b/Android.bp
-@@ -36,13 +36,6 @@ license {
- ],
- }
-
--genrule {
-- name: "copy_libsqlite3-sys_build_out",
-- srcs: ["out/*"],
-- cmd: "cp $(in) $(genDir)",
-- out: ["bindgen.rs"],
--}
--
- rust_library {
- name: "liblibsqlite3_sys",
- host_supported: true,
-@@ -50,7 +43,7 @@ rust_library {
+@@ -42,7 +42,10 @@ rust_library {
+ crate_name: "libsqlite3_sys",
cargo_env_compat: true,
- srcs: [
- "src/lib.rs",
-- ":copy_libsqlite3-sys_build_out",
+ cargo_pkg_version: "0.22.2",
+- srcs: ["src/lib.rs"],
++ srcs: [
++ "src/lib.rs",
+ ":libsqlite3_bindgen",
- ],
++ ],
edition: "2018",
features: [
-@@ -59,7 +52,7 @@ rust_library {
+ "default",
+@@ -50,6 +53,7 @@ rust_library {
"pkg-config",
"vcpkg",
],
-- shared_libs: ["libsqlite3"],
+ shared_libs: ["libsqlite"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
-@@ -75,7 +68,7 @@ rust_test {
+@@ -62,7 +66,10 @@ rust_test {
+ crate_name: "libsqlite3_sys",
cargo_env_compat: true,
- srcs: [
- "src/lib.rs",
-- ":copy_libsqlite3-sys_build_out",
+ cargo_pkg_version: "0.22.2",
+- srcs: ["src/lib.rs"],
++ srcs: [
++ "src/lib.rs",
+ ":libsqlite3_bindgen",
- ],
++ ],
test_suites: ["general-tests"],
auto_gen_config: true,
-@@ -89,5 +82,26 @@ rust_test {
+ test_options: {
+@@ -75,6 +82,7 @@ rust_test {
"pkg-config",
"vcpkg",
],
-- shared_libs: ["libsqlite3"],
+ shared_libs: ["libsqlite"],
-+}
-+
-+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",
}
+
+ rust_bindgen {
