Snap for 11078623 from aed9482b38fd582aee0c711082f0c31b21af3eed to 24Q1-release
Change-Id: If3d00478221093edfbda72cbcf91628ae6f0ecdd
diff --git a/Android.bp b/Android.bp
index f4d7aef..47ab7d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,94 +1,151 @@
-// 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.
-
-
-rust_defaults {
- name: "bytemuck_test_defaults",
- crate_name: "bytemuck",
+rust_test {
+ name: "bytemuck_test_tests_array_tests",
+ host_supported: true,
+ crate_name: "array_tests",
cargo_env_compat: true,
cargo_pkg_version: "1.13.1",
+ srcs: ["tests/array_tests.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"bytemuck_derive",
"derive",
],
- rustlibs: [
- "libbytemuck",
- ],
+ rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
}
rust_test {
- name: "bytemuck_test_tests_array_tests",
- defaults: ["bytemuck_test_defaults"],
- host_supported: true,
- srcs: ["tests/array_tests.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
name: "bytemuck_test_tests_cast_slice_tests",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "cast_slice_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/cast_slice_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_test {
name: "bytemuck_test_tests_checked_tests",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "checked_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/checked_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_test {
name: "bytemuck_test_tests_doc_tests",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "doc_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/doc_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_test {
name: "bytemuck_test_tests_offset_of_tests",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "offset_of_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/offset_of_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_test {
name: "bytemuck_test_tests_std_tests",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "std_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/std_tests.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_test {
name: "bytemuck_test_tests_transparent",
- defaults: ["bytemuck_test_defaults"],
host_supported: true,
+ crate_name: "transparent",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.13.1",
srcs: ["tests/transparent.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "bytemuck_derive",
+ "derive",
+ ],
+ rustlibs: ["libbytemuck"],
+ proc_macros: ["libbytemuck_derive"],
}
rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index fef5321..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true,
- "features": "derive"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1453a5e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+ "features": [
+ "derive"
+ ],
+ "tests": true
+}