diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:28 +0000 |
commit | b88ec5acf3c6c2a7d48e5ae6d19517e7941ce057 (patch) | |
tree | 3b1504f99e3af24d7ff3099804413156a07ffab5 | |
parent | e32cb057fe091ff526d2ed7e5194ebb678b75dab (diff) | |
parent | 0d5e3d854bcd7c30a0148d2a18ac403dee768a95 (diff) | |
download | itoa-b88ec5acf3c6c2a7d48e5ae6d19517e7941ce057.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0d5e3d854b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/itoa/+/1912499
Change-Id: I11e8ee4dd6a3b3f0a23f4494f8e1f50f2046ddfe
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 48 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 43 insertions, 30 deletions
@@ -38,14 +38,18 @@ license { ], } -rust_defaults { - name: "itoa_test_defaults", +rust_test { + name: "itoa_test_tests_test", + host_supported: true, crate_name: "test", - srcs: ["tests/test.rs"], cargo_env_compat: true, cargo_pkg_version: "0.4.8", + srcs: ["tests/test.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -56,19 +60,6 @@ rust_defaults { ], } -rust_test_host { - name: "itoa_host_test_tests_test", - defaults: ["itoa_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "itoa_device_test_tests_test", - defaults: ["itoa_test_defaults"], -} - rust_library { name: "libitoa", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 82e93e3..9095ded 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,41 +1,63 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ + { + "path": "external/rust/crates/base64" + }, + { + "path": "external/rust/crates/bitflags" + }, + { + "path": "external/rust/crates/either" + }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/rand_chacha" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "bitflags_device_test_src_lib" + "path": "external/rust/crates/unicode-xid" }, { - "name": "bitflags_device_test_tests_basic" + "path": "external/rust/crates/url" + } + ], + "presubmit": [ + { + "name": "ZipFuseTest" }, { - "name": "either_device_test_src_lib" + "name": "authfs_device_test_src_lib" }, { - "name": "itoa_device_test_tests_test" + "name": "itoa_test_tests_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "microdroid_manager_test" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "authfs_device_test_src_lib" }, { - "name": "url_device_test_src_lib" + "name": "itoa_test_tests_test" }, { - "name": "url_device_test_tests_data" + "name": "microdroid_manager_test" }, { - "name": "url_device_test_tests_unit" + "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 |