aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2020-07-17 01:57:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-17 01:57:28 +0000
commit7a957e5fa39b16f9b474a566af7f926002501bac (patch)
tree3fa59edc97ed9d23c564b9ea9ccdc6b1873ced39
parentd156948d1a59d7b3dc9c8102acdba83f4c79555a (diff)
parent92e44aa31b0c5bfc2d059f0d924841098d94301c (diff)
downloadgetrandom-7a957e5fa39b16f9b474a566af7f926002501bac.tar.gz
Add rust_test and update TEST_MAPPING am: 6d88908777 am: 92e44aa31b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/getrandom/+/1365108 Change-Id: Id3e3471f2c4e27cefd5243c51606775ec0e7ec89
-rw-r--r--Android.bp51
-rw-r--r--TEST_MAPPING19
2 files changed, 69 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 0a49d28..267bfe1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,53 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --device --run --dependencies --tests.
+
+rust_defaults {
+ name: "getrandom_defaults",
+ crate_name: "getrandom",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ rustlibs: [
+ "libcfg_if",
+ "liblibc",
+ ],
+}
+
+rust_test_host {
+ name: "getrandom_host_test_src_lib",
+ defaults: ["getrandom_defaults"],
+ srcs: ["src/lib.rs"],
+}
+
+rust_test {
+ name: "getrandom_device_test_src_lib",
+ defaults: ["getrandom_defaults"],
+ srcs: ["src/lib.rs"],
+}
+
+rust_defaults {
+ name: "getrandom_defaults_common",
+ crate_name: "common",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ rustlibs: [
+ "libcfg_if",
+ "libgetrandom",
+ "liblibc",
+ ],
+}
+
+rust_test_host {
+ name: "getrandom_host_test_tests_common",
+ defaults: ["getrandom_defaults_common"],
+ srcs: ["tests/common.rs"],
+}
+
+rust_test {
+ name: "getrandom_device_test_tests_common",
+ defaults: ["getrandom_defaults_common"],
+ srcs: ["tests/common.rs"],
+}
rust_library {
name: "libgetrandom",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..f92a434
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,19 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+ "presubmit": [
+ {
+ "name": "getrandom_host_test_src_lib",
+ "host": true
+ },
+ {
+ "name": "getrandom_device_test_src_lib"
+ },
+ {
+ "name": "getrandom_host_test_tests_common",
+ "host": true
+ },
+ {
+ "name": "getrandom_device_test_tests_common"
+ }
+ ]
+}