diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-08 21:48:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 21:48:07 +0000 |
| commit | 0fb80841978ca3f15ace57d950200f99512255a0 (patch) | |
| tree | 6e1cf0dc83ad701de25d605a4c783bba1b7f49f1 | |
| parent | 5529cffc6a70ab39c0c3dffc701c80ecbb87f194 (diff) | |
| parent | 87f141a5fbcc45b573e092702f6bfe0058df9326 (diff) | |
| download | fnv-0fb80841978ca3f15ace57d950200f99512255a0.tar.gz | |
Merge "Add apex to fnv rust crate" am: e574bea4a4 am: 4759579d53 am: 56cbcd16fc am: 11ec1dd23b am: 87f141a5fb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1850773
Change-Id: Icbf3d51eab4aeadc3ad6b3c73f63975ab7fa34c9
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | cargo2android.json | 9 |
2 files changed, 25 insertions, 4 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --device --run --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_fnv_license"], @@ -37,9 +38,11 @@ license { } rust_defaults { - name: "fnv_defaults", + name: "fnv_test_defaults", crate_name: "fnv", srcs: ["lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.0.7", test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -51,22 +54,31 @@ rust_defaults { rust_test_host { name: "fnv_host_test_lib", - defaults: ["fnv_defaults"], + defaults: ["fnv_test_defaults"], + test_options: { + unit_test: true, + }, } rust_test { name: "fnv_device_test_lib", - defaults: ["fnv_defaults"], + defaults: ["fnv_test_defaults"], } rust_library { name: "libfnv", host_supported: true, crate_name: "fnv", + cargo_env_compat: true, + cargo_pkg_version: "1.0.7", srcs: ["lib.rs"], edition: "2015", features: [ "default", "std", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..86c645c --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true, + "tests": true + }
\ No newline at end of file |