aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-22 23:49:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-22 23:49:17 +0000
commit414492e62e00c618c769c944778b79f166e894e5 (patch)
tree6574568d06584ce5ba0c0bc58371730545977c2f
parentd2001e36c0504d52acfff6f9269c2dfb5f1220f4 (diff)
parent333ff38cb61cad6c6c013cfe09dd7c28f6456cde (diff)
downloadminimal-lexical-414492e62e00c618c769c944778b79f166e894e5.tar.gz
Migrate to cargo_embargo. am: 84133e0578 am: 333ff38cb6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/minimal-lexical/+/2829797 Change-Id: I30e4ac2c65eda117d54e52024ae3c27b0ec2b93b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp111
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)4
2 files changed, 88 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp
index e4d49f7..e17cc3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 {
@@ -60,99 +60,162 @@ rust_library {
vendor_available: true,
}
-rust_defaults {
- name: "minimal-lexical_test_defaults",
- crate_name: "minimal_lexical",
+rust_test {
+ name: "minimal-lexical_test_tests_integration_tests",
+ host_supported: true,
+ crate_name: "integration_tests",
cargo_env_compat: true,
cargo_pkg_version: "0.2.1",
+ srcs: ["tests/integration_tests.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
"std",
],
- rustlibs: [
- "libminimal_lexical",
- ],
-}
-
-rust_test {
- name: "minimal-lexical_test_tests_integration_tests",
- defaults: ["minimal-lexical_test_defaults"],
- host_supported: true,
- srcs: ["tests/integration_tests.rs"],
- test_options: {
- unit_test: true,
- },
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_lemire_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "lemire_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/lemire_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_mask_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "mask_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/mask_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_number_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "number_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/number_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_parse_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "parse_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/parse_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_rounding_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "rounding_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/rounding_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_slow_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "slow_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/slow_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
rust_test {
name: "minimal-lexical_test_tests_vec_tests",
- defaults: ["minimal-lexical_test_defaults"],
host_supported: true,
+ crate_name: "vec_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.1",
srcs: ["tests/vec_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "std",
+ ],
+ rustlibs: ["libminimal_lexical"],
}
diff --git a/cargo2android.json b/cargo_embargo.json
index 8e490de..7f14879 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,9 +1,7 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.virt"
],
- "device": true,
- "run": true,
"tests": true
}