Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3575b7b428 am: f433681a48
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusticata-macros/+/1912695
Change-Id: I94dabff84c4e89db24ab47f7fd647255e07db02d
diff --git a/Android.bp b/Android.bp
index cdc6399..02cb373 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,29 +52,20 @@
],
}
-rust_defaults {
- name: "rusticata-macros_test_defaults",
+rust_test {
+ name: "rusticata-macros_test_src_lib",
+ host_supported: true,
crate_name: "rusticata_macros",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "4.0.0",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
rustlibs: [
"libnom",
],
}
-
-rust_test_host {
- name: "rusticata-macros_host_test_src_lib",
- defaults: ["rusticata-macros_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "rusticata-macros_device_test_src_lib",
- defaults: ["rusticata-macros_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1390fe5..aaad5d5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/oid-registry"
+ }
+ ],
"presubmit": [
{
"name": "libapkverify.integration_test"
@@ -11,10 +16,21 @@
"name": "microdroid_manager_test"
},
{
- "name": "oid-registry_device_test_src_lib"
+ "name": "rusticata-macros_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "libapkverify.integration_test"
},
{
- "name": "rusticata-macros_device_test_src_lib"
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "rusticata-macros_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index a005be1..d36fb44 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,5 @@
{
- "device": true,
- "run": true,
- "tests": true
-}
-
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
