diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:55 +0000 |
commit | 38e03dcdd42d5fd014bff8866424c82612cc4769 (patch) | |
tree | f9d956a4c69e336006d96b2ca15d00ebd2c187ac | |
parent | 32c69da786e1de6c5bd4da4b96999b0df3499ee6 (diff) | |
parent | 5ba1c490b6b84c05c4cebc6bbf72c7880b7aeac5 (diff) | |
download | oorandom-38e03dcdd42d5fd014bff8866424c82612cc4769.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6554698923 am: 5ba1c490b6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oorandom/+/1912503
Change-Id: Ib24e86cf6a4dc58ca7b801b0fba087b4fe84ba7a
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 12 insertions, 9 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,6 +22,8 @@ rust_library { name: "liboorandom", host_supported: true, crate_name: "oorandom", + cargo_env_compat: true, + cargo_pkg_version: "11.1.3", srcs: ["src/lib.rs"], edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..3cbd48d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |