Enable tests am: f538b4ee8a am: b50e06f6b3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/1862635
Change-Id: I2a871573023eed58d1ad682b04fd95ce6cb1361a
diff --git a/Android.bp b/Android.bp
index 1ca2639..8f89a16 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@
name: "libnum_cpus",
host_supported: true,
crate_name: "num_cpus",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.0",
srcs: ["src/lib.rs"],
edition: "2015",
rustlibs: [
@@ -54,5 +56,21 @@
min_sdk_version: "29",
}
-// dependent_library ["feature_list"]
-// libc-0.2.94 "default,std"
+rust_defaults {
+ name: "num_cpus_test_defaults",
+ crate_name: "num_cpus",
+ srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.0",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ rustlibs: [
+ "liblibc",
+ ],
+}
+
+rust_test {
+ name: "num_cpus_device_test_src_lib",
+ defaults: ["num_cpus_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 510a953..cfe14cc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,9 +2,6 @@
{
"presubmit": [
{
- "name": "ZipFuseTest"
- },
- {
"name": "anyhow_device_test_src_lib"
},
{
@@ -41,9 +38,6 @@
"name": "anyhow_device_test_tests_test_source"
},
{
- "name": "authfs_device_test_src_lib"
- },
- {
"name": "base64_device_test_tests_decode"
},
{
@@ -59,9 +53,15 @@
"name": "futures-util_device_test_src_lib"
},
{
+ "name": "grpcio_device_test_src_lib"
+ },
+ {
"name": "keystore2_selinux_concurrency_test"
},
{
+ "name": "num_cpus_device_test_src_lib"
+ },
+ {
"name": "tokio-test_device_test_src_lib"
},
{
@@ -273,9 +273,6 @@
},
{
"name": "unicode-xid_device_test_tests_exhaustive_tests"
- },
- {
- "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 01465d0..f72af5e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,5 +7,6 @@
"min_sdk_version": "29",
"dependencies": true,
"device": true,
- "run": true
-}
\ No newline at end of file
+ "run": true,
+ "tests": true
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..cb85884
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,19 @@
+diff --git a/Android.bp b/Android.bp
+index a441683..8f89a16 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -70,14 +70,6 @@ rust_defaults {
+ ],
+ }
+
+-rust_test_host {
+- name: "num_cpus_host_test_src_lib",
+- defaults: ["num_cpus_test_defaults"],
+- test_options: {
+- unit_test: true,
+- },
+-}
+-
+ rust_test {
+ name: "num_cpus_device_test_src_lib",
+ defaults: ["num_cpus_test_defaults"],