diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 89cebdd075f891b34eb9f5daad65591495fc4f86 (patch) | |
tree | ee5f57fcda7aa67a9ab5b8d75bb009441b4477b8 | |
parent | 7c38ae5ac7d8965b29ed7bf27fd6dbccda629b6a (diff) | |
parent | 09c369d9d085419fe514a8eb64506e15f7439ea8 (diff) | |
download | tinyvec_macros-89cebdd075f891b34eb9f5daad65591495fc4f86.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 24 | ||||
-rw-r--r-- | TEST_MAPPING | 25 |
2 files changed, 15 insertions, 34 deletions
@@ -37,6 +37,8 @@ rust_library { name: "libtinyvec_macros", host_supported: true, crate_name: "tinyvec_macros", + cargo_env_compat: true, + cargo_pkg_version: "0.1.0", srcs: ["src/lib.rs"], edition: "2018", apex_available: [ @@ -45,25 +47,3 @@ rust_library { ], min_sdk_version: "29", } - -rust_defaults { - name: "tinyvec_macros_defaults", - crate_name: "tinyvec_macros", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "tinyvec_macros_host_test_src_lib", - defaults: ["tinyvec_macros_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "tinyvec_macros_device_test_src_lib", - defaults: ["tinyvec_macros_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index dedf783..15c97a1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,26 +1,27 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "doh_unit_test" - }, + "imports": [ { - "name": "quiche_device_test_src_lib" + "path": "external/rust/crates/quiche" }, { - "name": "tinyvec_macros_device_test_src_lib" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-normalization_device_test_src_lib" + "path": "external/rust/crates/unicode-normalization" }, { - "name": "url_device_test_src_lib" - }, + "path": "external/rust/crates/url" + } + ], + "presubmit": [ { - "name": "url_device_test_tests_data" - }, + "name": "doh_unit_test" + } + ], + "presubmit-rust": [ { - "name": "url_device_test_tests_unit" + "name": "doh_unit_test" } ] } |