diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-11 01:37:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-11 01:37:28 +0000 |
commit | da5df95cb2c1077adfec28eb3399d49f6e56709e (patch) | |
tree | b6c4ec9c63aed386f46cf95d367160450c2bf6ab | |
parent | 1a13e1f6dcdc06d066b650e8b7657ecc50777b6f (diff) | |
parent | 722eb9d538793ba481e1a56e6b9a99d2e5e8be40 (diff) | |
download | hashbrown-da5df95cb2c1077adfec28eb3399d49f6e56709e.tar.gz |
Migrate to cargo_embargo. am: 73dccea8cf am: 8ccaf13628 am: 722eb9d538
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashbrown/+/2826476
Change-Id: Ibbc5a4af241fe17347b82a4b8f1407364418f2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | cargo_embargo.json | 16 |
3 files changed, 47 insertions, 27 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 { @@ -66,13 +66,18 @@ rust_test { ], } -rust_defaults { - name: "hashbrown_test_defaults", - crate_name: "hashbrown", +rust_test { + name: "hashbrown_test_tests_hasher", + host_supported: true, + crate_name: "hasher", cargo_env_compat: true, cargo_pkg_version: "0.12.3", + srcs: ["tests/hasher.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2021", features: [ "ahash", @@ -92,23 +97,33 @@ rust_defaults { } rust_test { - name: "hashbrown_test_tests_hasher", - defaults: ["hashbrown_test_defaults"], - host_supported: true, - srcs: ["tests/hasher.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "hashbrown_test_tests_set", - defaults: ["hashbrown_test_defaults"], host_supported: true, + crate_name: "set", + cargo_env_compat: true, + cargo_pkg_version: "0.12.3", srcs: ["tests/set.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "ahash", + "default", + "inline-more", + "raw", + ], + rustlibs: [ + "libahash", + "libfnv", + "libhashbrown", + "liblazy_static", + "librand", + "librayon", + "libserde_test", + ], } rust_library { @@ -125,9 +140,7 @@ rust_library { "inline-more", "raw", ], - rustlibs: [ - "libahash", - ], + rustlibs: ["libahash"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 4afc81f..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "device": true, - "features": "ahash,default,inline-more,raw", - "run": true, - "tests": true, - "dependency-blocklist": [ - "doc_comment" - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..88a26ce --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,16 @@ +{ + "features": [ + "ahash", + "default", + "inline-more", + "raw" + ], + "package": { + "hashbrown": { + "dep_blocklist": [ + "libdoc_comment" + ] + } + }, + "tests": true +} |