diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:04:29 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:04:29 +0000 |
commit | 7f71fc495675ac4b20f11345249c0ab2c62da12c (patch) | |
tree | 1aed37cc34728167503c85b03a9bffb82ce68948 | |
parent | d5c6acb380cc651594e595e26975fab932f37001 (diff) | |
parent | 8893977427b70778d95b326b7bdd42edd9082240 (diff) | |
download | scopeguard-android13-mainline-extservices-release.tar.gz |
Snap for 8564071 from 8893977427b70778d95b326b7bdd42edd9082240 to mainline-extservices-releaseaml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020android13-mainline-extservices-release
Change-Id: Icfb694aeb31866af3d0106a6960ccb29f6cd31a3
-rw-r--r-- | Android.bp | 32 | ||||
-rw-r--r-- | TEST_MAPPING | 43 | ||||
-rw-r--r-- | cargo2android.json | 13 |
3 files changed, 72 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_scopeguard_license"], @@ -40,33 +41,38 @@ rust_library { name: "libscopeguard", host_supported: true, crate_name: "scopeguard", + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", srcs: ["src/lib.rs"], edition: "2015", features: [ "default", "use_std", ], + apex_available: [ + "//apex_available:platform", + "com.android.bluetooth", + "com.android.compos", + "com.android.virt", + ], + min_sdk_version: "29", } -rust_defaults { - name: "scopeguard_defaults", +rust_test { + name: "scopeguard_test_src_lib", + host_supported: true, crate_name: "scopeguard", + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", "use_std", ], } - -rust_test_host { - name: "scopeguard_host_test_src_lib", - defaults: ["scopeguard_defaults"], -} - -rust_test { - name: "scopeguard_device_test_src_lib", - defaults: ["scopeguard_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 3ac1ffc..af52a19 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,11 +1,48 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/base64" + }, + { + "path": "external/rust/crates/crossbeam-deque" + }, + { + "path": "external/rust/crates/crossbeam-epoch" + }, + { + "path": "external/rust/crates/tinytemplate" + }, + { + "path": "external/rust/crates/tinyvec" + }, + { + "path": "external/rust/crates/unicode-xid" + }, + { + "path": "external/rust/crates/vulkano" + } + ], "presubmit": [ { - "name": "scopeguard_device_test_src_lib" + "name": "ZipFuseTest" + }, + { + "name": "apkdmverity.test" + }, + { + "name": "scopeguard_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "apkdmverity.test" }, { - "name": "lock_api_device_test_src_lib" + "name": "scopeguard_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..4384672 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,13 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.bluetooth", + "com.android.compos", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "run": true, + "tests": true +} |