Migrate to cargo_embargo. am: aee1eb4a33 am: b903f9786b am: 52655199f2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bytes/+/2823210
Change-Id: I46838ca68c99954f2980befb3540eceea05d79aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 05bfcd5..ee61c32 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 {
@@ -18,13 +18,18 @@
],
}
-rust_defaults {
- name: "bytes_test_defaults",
- crate_name: "bytes",
+rust_test {
+ name: "bytes_test_tests_test_buf",
+ host_supported: true,
+ crate_name: "test_buf",
cargo_env_compat: true,
cargo_pkg_version: "1.4.0",
+ srcs: ["tests/test_buf.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -39,113 +44,253 @@
}
rust_test {
- name: "bytes_test_tests_test_buf",
- defaults: ["bytes_test_defaults"],
- host_supported: true,
- srcs: ["tests/test_buf.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
name: "bytes_test_tests_test_buf_mut",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_buf_mut",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_buf_mut.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_bytes",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_bytes",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_bytes.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_bytes_odd_alloc",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_bytes_odd_alloc",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_bytes_odd_alloc.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_bytes_vec_alloc",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_bytes_vec_alloc",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_bytes_vec_alloc.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_chain",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_chain",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_chain.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_debug",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_debug",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_debug.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_iter",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_iter",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_iter.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_reader",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_reader",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_reader.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_serde",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_serde",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_serde.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_test {
name: "bytes_test_tests_test_take",
- defaults: ["bytes_test_defaults"],
host_supported: true,
+ crate_name: "test_take",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
srcs: ["tests/test_take.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
+ edition: "2018",
+ features: [
+ "default",
+ "serde",
+ "std",
+ ],
+ rustlibs: [
+ "libbytes",
+ "libserde",
+ "libserde_test",
+ ],
}
rust_library {
@@ -161,9 +306,7 @@
"serde",
"std",
],
- rustlibs: [
- "libserde",
- ],
+ rustlibs: ["libserde"],
apex_available: [
"//apex_available:platform",
"com.android.btservices",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index a77ea80..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.resolv",
- "com.android.uwb",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "features": "default,serde",
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f052496
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.btservices",
+ "com.android.compos",
+ "com.android.resolv",
+ "com.android.uwb",
+ "com.android.virt"
+ ],
+ "features": [
+ "default",
+ "serde"
+ ],
+ "min_sdk_version": "29",
+ "tests": true
+}