diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:08 +0000 |
commit | 9415e294a09b1b4135e9a7379b72b40dcf7dcc3c (patch) | |
tree | db579edde2c2aedecea816e84522aa87d79e3c57 | |
parent | af5c15898f36f951697456e1a3e10f1ccb5c65ce (diff) | |
parent | a72429ce1b23f821703d103d6636444a48d44709 (diff) | |
download | crc32fast-9415e294a09b1b4135e9a7379b72b40dcf7dcc3c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 2064c0e144 am: e9cf9d0af0 am: a72429ce1b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crc32fast/+/1912051
Change-Id: Ifd83d8ad83040fe1e62890e58e78cc7e79399bc4
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 31 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 38 insertions, 18 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "crc32fast_test_defaults", +rust_test { + name: "crc32fast_test_src_lib", + host_supported: true, crate_name: "crc32fast", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.2.1", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -59,19 +63,6 @@ rust_defaults { ], } -rust_test_host { - name: "crc32fast_host_test_src_lib", - defaults: ["crc32fast_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "crc32fast_device_test_src_lib", - defaults: ["crc32fast_test_defaults"], -} - rust_library { name: "libcrc32fast", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 2f9b261..a46d45f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,13 +2,42 @@ { "presubmit": [ { - "name": "crc32fast_device_test_src_lib" + "name": "ZipFuseTest" + }, + { + "name": "crc32fast_test_src_lib" + }, + { + "name": "libapkverify.integration_test" + }, + { + "name": "libapkverify.test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "crc32fast_test_src_lib" }, { "name": "libapkverify.integration_test" }, { "name": "libapkverify.test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 72ca2d4..ac56e26 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,4 +7,4 @@ "device": true, "run": true, "tests": true -} +}
\ No newline at end of file |