diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:09 +0000 |
commit | e464adb736d7f922bf3940aa65cb8dd7c64f370c (patch) | |
tree | 8a1df24ff4549f3ff836f4b7f89f4bbeff716fc4 | |
parent | fcc9f38e21821f437e03207424f83d619a0bd374 (diff) | |
parent | d7bc173feb8277510068b91c66bcce51bfc113f2 (diff) | |
download | cast-e464adb736d7f922bf3940aa65cb8dd7c64f370c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f021041ae9 am: b786a15fd1 am: d7bc173feb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cast/+/1912046
Change-Id: I52fadab97d60f13ab80879b45b2e0777d9ae5597
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 31 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 26 insertions, 35 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -37,33 +37,24 @@ license { ], } -rust_defaults { - name: "cast_test_defaults", +rust_test { + name: "cast_test_src_lib", + host_supported: true, crate_name: "cast", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.3.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ "libquickcheck", ], } -rust_test_host { - name: "cast_host_test_src_lib", - defaults: ["cast_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "cast_device_test_src_lib", - defaults: ["cast_test_defaults"], -} - rust_library { name: "libcast", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 4410288..209b12d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,32 +1,27 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "base64_device_test_tests_decode" - }, - { - "name": "base64_device_test_tests_encode" - }, - { - "name": "base64_device_test_tests_helpers" - }, + "imports": [ { - "name": "cast_device_test_src_lib" + "path": "external/rust/crates/base64" }, { - "name": "tinytemplate_device_test_src_lib" + "path": "external/rust/crates/tinytemplate" }, { - "name": "tinyvec_device_test_tests_arrayvec" + "path": "external/rust/crates/tinyvec" }, { - "name": "tinyvec_device_test_tests_tinyvec" - }, + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ { - "name": "unicode-xid_device_test_src_lib" - }, + "name": "cast_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "cast_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |