Enable tests am: c08482e378 am: 27be923501 am: 45ca96e15a am: b9ab87082a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remain/+/2147841
Change-Id: Ic283a6e14e39326e4507f06d789413f750e0ced9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index fe3e3a5..7c983de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,3 +50,40 @@
"libsyn",
],
}
+
+rust_defaults {
+ name: "remain_test_defaults",
+ crate_name: "remain",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.2",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ rustlibs: [
+ "libproc_macro2",
+ "libquote",
+ "libsyn",
+ ],
+ proc_macros: [
+ "libremain",
+ "librustversion",
+ ],
+}
+
+rust_test_host {
+ name: "remain_test_tests_stable",
+ defaults: ["remain_test_defaults"],
+ srcs: ["tests/stable.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test_host {
+ name: "remain_test_tests_unstable",
+ defaults: ["remain_test_defaults"],
+ srcs: ["tests/unstable.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
diff --git a/cargo2android.json b/cargo2android.json
index 958632b..f1aaae2 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,3 +1,5 @@
{
- "run": true
-}
\ No newline at end of file
+ "patch": "patches/Android.bp.patch",
+ "run": true,
+ "tests": true
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..592a2fd
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,56 @@
+diff --git a/Android.bp b/Android.bp
+index d175c6d..7c983de 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -51,27 +51,6 @@ rust_proc_macro {
+ ],
+ }
+
+-rust_test_host {
+- name: "remain_test_src_lib",
+- crate_name: "remain",
+- cargo_env_compat: true,
+- cargo_pkg_version: "0.2.2",
+- srcs: ["src/lib.rs"],
+- test_suites: ["general-tests"],
+- auto_gen_config: true,
+- test_options: {
+- unit_test: true,
+- },
+- edition: "2018",
+- rustlibs: [
+- "libproc_macro2",
+- "libquote",
+- "libsyn",
+- "libtrybuild",
+- ],
+- proc_macros: ["librustversion"],
+-}
+-
+ rust_defaults {
+ name: "remain_test_defaults",
+ crate_name: "remain",
+@@ -84,7 +63,6 @@ rust_defaults {
+ "libproc_macro2",
+ "libquote",
+ "libsyn",
+- "libtrybuild",
+ ],
+ proc_macros: [
+ "libremain",
+@@ -92,15 +70,6 @@ rust_defaults {
+ ],
+ }
+
+-rust_test_host {
+- name: "remain_test_tests_compiletest",
+- defaults: ["remain_test_defaults"],
+- srcs: ["tests/compiletest.rs"],
+- test_options: {
+- unit_test: true,
+- },
+-}
+-
+ rust_test_host {
+ name: "remain_test_tests_stable",
+ defaults: ["remain_test_defaults"],
