diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-10 21:15:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 21:15:23 +0000 |
commit | e36f979e2841ec713b9962fe188d04185a1b198c (patch) | |
tree | 5ac899ecb853fb1b5a210af741ea0c1ed1e4c9a6 | |
parent | bc8c811019a3e803519ef8088d3a95e3582d959b (diff) | |
parent | d8f808cb55fb0a339f34c7e982a86741da8067e6 (diff) | |
download | getrandom-e36f979e2841ec713b9962fe188d04185a1b198c.tar.gz |
Migrate to cargo_embargo. am: d8f808cb55
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/getrandom/+/2824643
Change-Id: I3153544a3894c88c891086e3af852f656783b20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 36 | ||||
-rw-r--r-- | cargo2android.json | 8 | ||||
-rw-r--r-- | cargo_embargo.json | 6 |
3 files changed, 27 insertions, 23 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -57,13 +57,18 @@ rust_test { ], } -rust_defaults { - name: "getrandom_test_defaults", - crate_name: "getrandom", +rust_test { + name: "getrandom_test_tests_normal", + host_supported: true, + crate_name: "normal", cargo_env_compat: true, cargo_pkg_version: "0.2.8", + srcs: ["tests/normal.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: ["std"], rustlibs: [ @@ -74,23 +79,24 @@ rust_defaults { } rust_test { - name: "getrandom_test_tests_normal", - defaults: ["getrandom_test_defaults"], - host_supported: true, - srcs: ["tests/normal.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "getrandom_test_tests_rdrand", - defaults: ["getrandom_test_defaults"], host_supported: true, + crate_name: "rdrand", + cargo_env_compat: true, + cargo_pkg_version: "0.2.8", srcs: ["tests/rdrand.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: ["std"], + rustlibs: [ + "libcfg_if", + "libgetrandom", + "liblibc", + ], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 305a6eb..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": true, - "device": true, - "features": "std", - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..f1149bc --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,6 @@ +{ + "features": [ + "std" + ], + "tests": true +} |