diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 21:48:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 21:48:25 +0000 |
| commit | 36ff0118e8949dc05eed3d107ddb119dab48a929 (patch) | |
| tree | 78bdd030848bc0f6a314e34ac61587ac1bd91247 | |
| parent | 6af7f33fbb04e9dbf5f0a58bc768eb57f704570c (diff) | |
| parent | 947f24daf901ed5005432459aa1bcd5734abeeae (diff) | |
| download | scopeguard-36ff0118e8949dc05eed3d107ddb119dab48a929.tar.gz | |
Merge "Add apex to scopeguard rust crate" am: 4e5ef60e97 am: 152c7aba9c am: 947f24daf9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1850643
Change-Id: Ib3724c80b9e028d5fc5097478fa60895d34c6552
| -rw-r--r-- | Android.bp | 11 | ||||
| -rw-r--r-- | cargo2android.json | 3 |
2 files changed, 10 insertions, 4 deletions
@@ -41,6 +41,8 @@ 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: [ @@ -50,13 +52,16 @@ rust_library { apex_available: [ "//apex_available:platform", "com.android.compos", + "com.android.virt", ], } rust_defaults { - name: "scopeguard_defaults", + name: "scopeguard_test_defaults", crate_name: "scopeguard", srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -68,7 +73,7 @@ rust_defaults { rust_test_host { name: "scopeguard_host_test_src_lib", - defaults: ["scopeguard_defaults"], + defaults: ["scopeguard_test_defaults"], test_options: { unit_test: true, }, @@ -76,5 +81,5 @@ rust_test_host { rust_test { name: "scopeguard_device_test_src_lib", - defaults: ["scopeguard_defaults"], + defaults: ["scopeguard_test_defaults"], } diff --git a/cargo2android.json b/cargo2android.json index de91d5d..a4a2e17 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,7 +1,8 @@ { "apex-available": [ "//apex_available:platform", - "com.android.compos" + "com.android.compos", + "com.android.virt" ], "dependencies": true, "device": true, |