diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:04:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:04:18 +0000 |
commit | f433681a485db3499d44959945a2aa8a9876fd26 (patch) | |
tree | cfae57bccaa32b6ac56b3c6eec93404b973c5c10 | |
parent | 8b5950bb30eab2c5e72054f4ca2badf772386605 (diff) | |
parent | 3575b7b4283cced6f92f84967c94dd4c4125075f (diff) | |
download | rusticata-macros-f433681a485db3499d44959945a2aa8a9876fd26.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3575b7b428
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusticata-macros/+/1912695
Change-Id: Id5907335c165f55036078ee9d058aff085c0398b
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 20 | ||||
-rw-r--r-- | cargo2android.json | 9 |
3 files changed, 29 insertions, 23 deletions
@@ -52,29 +52,20 @@ rust_library { ], } -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": "libapkverify.test" + }, + { + "name": "microdroid_manager_test" }, { - "name": "rusticata-macros_device_test_src_lib" + "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 |