diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-14 19:43:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 19:43:46 +0000 |
commit | 2c975dcef3f84357f13231565207be77effcd4f5 (patch) | |
tree | 91e0637afe996427d2f623c421943ee60d6f2d9b | |
parent | 386bdbc7f8fea3f485a1bcb6b7382cea4ba17222 (diff) | |
parent | 256e8589c9e5326873b45d60fab6a615e1895d43 (diff) | |
download | num-integer-2c975dcef3f84357f13231565207be77effcd4f5.tar.gz |
Migrate to cargo_embargo. am: 256e8589c9emu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-integer/+/2828200
Change-Id: If9d02771788584def958727a7fc5dade4c3410f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 47 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | cargo_embargo.json | 7 |
3 files changed, 33 insertions, 31 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 { @@ -50,9 +50,7 @@ rust_library { "std", ], cfgs: ["has_i128"], - rustlibs: [ - "libnum_traits", - ], + rustlibs: ["libnum_traits"], apex_available: [ "//apex_available:platform", "com.android.virt", @@ -79,18 +77,21 @@ rust_test { "std", ], cfgs: ["has_i128"], - rustlibs: [ - "libnum_traits", - ], + rustlibs: ["libnum_traits"], } -rust_defaults { - name: "num-integer_test_defaults", - crate_name: "num_integer", +rust_test { + name: "num-integer_test_tests_average", + host_supported: true, + crate_name: "average", cargo_env_compat: true, cargo_pkg_version: "0.1.45", + srcs: ["tests/average.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -104,21 +105,25 @@ rust_defaults { } rust_test { - name: "num-integer_test_tests_average", - defaults: ["num-integer_test_defaults"], - host_supported: true, - srcs: ["tests/average.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "num-integer_test_tests_roots", - defaults: ["num-integer_test_defaults"], host_supported: true, + crate_name: "roots", + cargo_env_compat: true, + cargo_pkg_version: "0.1.45", srcs: ["tests/roots.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2015", + features: [ + "default", + "std", + ], + cfgs: ["has_i128"], + rustlibs: [ + "libnum_integer", + "libnum_traits", + ], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 67a4c45..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "device": true, - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..7f14879 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,7 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "tests": true +} |