From d2661518f9d45713e77af5fb22013350edaa4a02 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:05:17 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: I935a5346ca5644c9c4e0791e8c4e71507c6a2075 --- Android.bp | 25 +++++-------- TEST_MAPPING | 102 ++++++++++++++++++----------------------------------- cargo2android.json | 6 ++-- 3 files changed, 46 insertions(+), 87 deletions(-) diff --git a/Android.bp b/Android.bp index 413167b..3568ea5 100644 --- a/Android.bp +++ b/Android.bp @@ -41,7 +41,6 @@ license { rust_library { name: "libserde", host_supported: true, - vendor_available: true, crate_name: "serde", cargo_env_compat: true, cargo_pkg_version: "1.0.130", @@ -75,16 +74,21 @@ rust_library { "//apex_available:platform", "com.android.virt", ], + vendor_available: true, } -rust_defaults { - name: "serde_test_defaults", +rust_test { + name: "serde_test_src_lib", + host_supported: true, crate_name: "serde", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.0.130", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -111,16 +115,3 @@ rust_defaults { ], proc_macros: ["libserde_derive"], } - -rust_test_host { - name: "serde_host_test_src_lib", - defaults: ["serde_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "serde_device_test_src_lib", - defaults: ["serde_test_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 5d1f043..da1479a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,59 +1,55 @@ // 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" - }, + "imports": [ { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/base64" }, { - "name": "bitflags_device_test_src_lib" + "path": "external/rust/crates/bitflags" }, { - "name": "bitflags_device_test_tests_basic" + "path": "external/rust/crates/bytes" }, { - "name": "bytes_device_test_src_lib" + "path": "external/rust/crates/either" }, { - "name": "bytes_device_test_tests_test_buf" + "path": "external/rust/crates/rand_chacha" }, { - "name": "bytes_device_test_tests_test_buf_mut" + "path": "external/rust/crates/serde-xml-rs" }, { - "name": "bytes_device_test_tests_test_bytes" + "path": "external/rust/crates/serde_cbor" }, { - "name": "bytes_device_test_tests_test_bytes_odd_alloc" + "path": "external/rust/crates/slab" }, { - "name": "bytes_device_test_tests_test_bytes_vec_alloc" + "path": "external/rust/crates/tinytemplate" }, { - "name": "bytes_device_test_tests_test_chain" + "path": "external/rust/crates/tinyvec" }, { - "name": "bytes_device_test_tests_test_debug" + "path": "external/rust/crates/unicode-bidi" }, { - "name": "bytes_device_test_tests_test_iter" + "path": "external/rust/crates/unicode-xid" }, { - "name": "bytes_device_test_tests_test_reader" - }, + "path": "external/rust/crates/url" + } + ], + "presubmit": [ { - "name": "bytes_device_test_tests_test_serde" + "name": "ZipFuseTest" }, { - "name": "bytes_device_test_tests_test_take" + "name": "apkdmverity.test" }, { - "name": "either_device_test_src_lib" + "name": "authfs_device_test_src_lib" }, { "name": "keystore2_test" @@ -65,70 +61,42 @@ "name": "legacykeystore_test" }, { - "name": "rand_chacha_device_test_src_lib" + "name": "microdroid_manager_test" }, { - "name": "serde-xml-rs_device_test_src_lib" + "name": "serde_test_src_lib" }, { - "name": "serde_cbor_device_test_src_lib" - }, - { - "name": "serde_cbor_device_test_tests_bennofs" - }, - { - "name": "serde_cbor_device_test_tests_canonical" - }, - { - "name": "serde_cbor_device_test_tests_de" - }, - { - "name": "serde_cbor_device_test_tests_enum" - }, - { - "name": "serde_cbor_device_test_tests_ser" - }, - { - "name": "serde_cbor_device_test_tests_std_types" - }, - { - "name": "serde_cbor_device_test_tests_tags" - }, - { - "name": "serde_cbor_device_test_tests_value" - }, - { - "name": "serde_device_test_src_lib" - }, - { - "name": "serde_test_device_test_src_lib" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "slab_device_test_src_lib" + "name": "ZipFuseTest" }, { - "name": "slab_device_test_tests_serde" + "name": "apkdmverity.test" }, { - "name": "slab_device_test_tests_slab" + "name": "authfs_device_test_src_lib" }, { - "name": "unicode-bidi_device_test_src_lib" + "name": "keystore2_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "keystore2_test_utils_test" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "legacykeystore_test" }, { - "name": "url_device_test_src_lib" + "name": "microdroid_manager_test" }, { - "name": "url_device_test_tests_data" + "name": "serde_test_src_lib" }, { - "name": "url_device_test_tests_unit" + "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 60842f7..2a35106 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,9 +7,9 @@ "std_atomic64" ], "dependencies": true, - "vendor_available": true, "device": true, "features": "default,derive", "run": true, - "tests": true -} + "tests": true, + "vendor-available": true +} \ No newline at end of file -- cgit v1.2.3