diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:20 +0000 |
commit | ea08e0e871a76c38dd763eb77bb35256c918d942 (patch) | |
tree | 56a6967701ac6101a0d79dd61724d3a4587ceb7a | |
parent | ae55449e06d91ff46455b95cb355c789d1435a19 (diff) | |
parent | 102265a9fc7e9503afaf345e524a1e2a063678ff (diff) | |
download | tinyvec-ea08e0e871a76c38dd763eb77bb35256c918d942.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3a423cbd39 am: 64d6692d06 am: 102265a9fc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/1912690
Change-Id: I163629d8f8e800f16cf7105d0c6ed83155ae1685
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | TEST_MAPPING | 27 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 25 insertions, 28 deletions
@@ -87,9 +87,10 @@ rust_defaults { ], } -rust_test_host { - name: "tinyvec_host_test_tests_arrayvec", +rust_test { + name: "tinyvec_test_tests_arrayvec", defaults: ["tinyvec_test_defaults"], + host_supported: true, srcs: ["tests/arrayvec.rs"], test_options: { unit_test: true, @@ -97,22 +98,11 @@ rust_test_host { } rust_test { - name: "tinyvec_device_test_tests_arrayvec", - defaults: ["tinyvec_test_defaults"], - srcs: ["tests/arrayvec.rs"], -} - -rust_test_host { - name: "tinyvec_host_test_tests_tinyvec", + name: "tinyvec_test_tests_tinyvec", defaults: ["tinyvec_test_defaults"], + host_supported: true, srcs: ["tests/tinyvec.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "tinyvec_device_test_tests_tinyvec", - defaults: ["tinyvec_test_defaults"], - srcs: ["tests/tinyvec.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index e448918..45f8bcc 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,29 +1,36 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "doh_unit_test" + "path": "external/rust/crates/quiche" }, { - "name": "quiche_device_test_src_lib" + "path": "external/rust/crates/unicode-normalization" }, { - "name": "tinyvec_device_test_tests_arrayvec" - }, + "path": "external/rust/crates/url" + } + ], + "presubmit": [ { - "name": "tinyvec_device_test_tests_tinyvec" + "name": "doh_unit_test" }, { - "name": "unicode-normalization_device_test_src_lib" + "name": "tinyvec_test_tests_arrayvec" }, { - "name": "url_device_test_src_lib" + "name": "tinyvec_test_tests_tinyvec" + } + ], + "presubmit-rust": [ + { + "name": "doh_unit_test" }, { - "name": "url_device_test_tests_data" + "name": "tinyvec_test_tests_arrayvec" }, { - "name": "url_device_test_tests_unit" + "name": "tinyvec_test_tests_tinyvec" } ] } diff --git a/cargo2android.json b/cargo2android.json index b86e1c0..5974d19 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,10 +3,10 @@ "//apex_available:platform", "com.android.resolv" ], - "min_sdk_version": "29", "dependencies": true, - "features": "alloc,default,tinyvec_macros", "device": true, + "features": "alloc,default,tinyvec_macros", + "min-sdk-version": "29", "run": true, "tests": true -} +}
\ No newline at end of file |