Snap for 6686656 from 79af151ccf17e1c52c2af3cee9a49c3922ebf3ab to sdk-release
Change-Id: If1f1073f78e1bce7039ae4f5c15a817ab263d8cf
diff --git a/Android.bp b/Android.bp
index f4daa57..e6745b9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,18 +1,28 @@
-// This file is generated by cargo2android.py.
+// This file is generated by cargo2android.py --run --dependencies --tests --device.
-rust_test_host {
- name: "cfg-if_tests_cfg_if",
+rust_defaults {
+ name: "cfg-if_defaults",
crate_name: "cfg_if",
- srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
}
rust_test_host {
- name: "cfg-if_tests_xcrate",
+ name: "cfg-if_host_test_src_lib",
+ defaults: ["cfg-if_defaults"],
+ srcs: ["src/lib.rs"],
+}
+
+rust_test {
+ name: "cfg-if_device_test_src_lib",
+ defaults: ["cfg-if_defaults"],
+ srcs: ["src/lib.rs"],
+}
+
+rust_defaults {
+ name: "cfg-if_defaults_xcrate",
crate_name: "xcrate",
- srcs: ["tests/xcrate.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -21,6 +31,18 @@
],
}
+rust_test_host {
+ name: "cfg-if_host_test_tests_xcrate",
+ defaults: ["cfg-if_defaults_xcrate"],
+ srcs: ["tests/xcrate.rs"],
+}
+
+rust_test {
+ name: "cfg-if_device_test_tests_xcrate",
+ defaults: ["cfg-if_defaults_xcrate"],
+ srcs: ["tests/xcrate.rs"],
+}
+
rust_library {
name: "libcfg_if",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 48de887..76e728e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,12 +1,18 @@
{
"presubmit": [
{
- "name": "cfg-if_tests_cfg_if",
+ "name": "cfg-if_host_test_src_lib",
"host": true
},
{
- "name": "cfg-if_tests_xcrate",
+ "name": "cfg-if_host_test_tests_xcrate",
"host": true
+ },
+ {
+ "name": "cfg-if_device_test_src_lib"
+ },
+ {
+ "name": "cfg-if_device_test_tests_xcrate"
}
]
}
