diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-09 16:06:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-09 16:06:01 +0000 |
| commit | e70f6bff080df3022364af29a0856bb5a69547d3 (patch) | |
| tree | 1bdf2914c22444fbaef96bd738600bc53d0a1e28 | |
| parent | f478b28da21963d147392b49afaafd45a3b6e629 (diff) | |
| parent | db1b76a7e351f3c71c35137e7bc0e58443daee84 (diff) | |
| download | cfg-if-e70f6bff080df3022364af29a0856bb5a69547d3.tar.gz | |
Add apex_available. am: 030e665e47 am: 76641df7be am: db1b76a7e3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/1874545
Change-Id: Ia56d4f8afeb519b35bc0fd49ee4a8a6954690d97
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | cargo2android.json | 1 |
2 files changed, 14 insertions, 6 deletions
@@ -38,9 +38,11 @@ license { } rust_defaults { - name: "cfg-if_defaults", + name: "cfg-if_test_defaults", crate_name: "cfg_if", srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.0.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -48,7 +50,7 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_src_lib", - defaults: ["cfg-if_defaults"], + defaults: ["cfg-if_test_defaults"], test_options: { unit_test: true, }, @@ -56,13 +58,15 @@ rust_test_host { rust_test { name: "cfg-if_device_test_src_lib", - defaults: ["cfg-if_defaults"], + defaults: ["cfg-if_test_defaults"], } rust_defaults { - name: "cfg-if_defaults_xcrate", + name: "cfg-if_test_defaults_xcrate", crate_name: "xcrate", srcs: ["tests/xcrate.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.0.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -73,7 +77,7 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_tests_xcrate", - defaults: ["cfg-if_defaults_xcrate"], + defaults: ["cfg-if_test_defaults_xcrate"], test_options: { unit_test: true, }, @@ -81,19 +85,22 @@ rust_test_host { rust_test { name: "cfg-if_device_test_tests_xcrate", - defaults: ["cfg-if_defaults_xcrate"], + defaults: ["cfg-if_test_defaults_xcrate"], } rust_library { name: "libcfg_if", host_supported: true, crate_name: "cfg_if", + cargo_env_compat: true, + cargo_pkg_version: "1.0.0", srcs: ["src/lib.rs"], edition: "2018", apex_available: [ "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index 506d866..79cdb2e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,6 +3,7 @@ "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt" ], "dependencies": true, |