Snap for 12134224 from 81ce1c8ce3b8671f0ebedbd7601e95a63ce64695 to simpleperf-release
Change-Id: I34046d5fd84dd546736f20d0e33a2cec5858d59b
diff --git a/Android.bp b/Android.bp
index d605d03..03f0272 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
// This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: ["external_rust_crates_bytes_license"],
@@ -24,7 +26,7 @@
crate_name: "test_buf",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_buf.rs"],
+ crate_root: "tests/test_buf.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -49,7 +51,7 @@
crate_name: "test_buf_mut",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_buf_mut.rs"],
+ crate_root: "tests/test_buf_mut.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -74,7 +76,7 @@
crate_name: "test_bytes",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_bytes.rs"],
+ crate_root: "tests/test_bytes.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -99,7 +101,7 @@
crate_name: "test_bytes_odd_alloc",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_bytes_odd_alloc.rs"],
+ crate_root: "tests/test_bytes_odd_alloc.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -124,7 +126,7 @@
crate_name: "test_bytes_vec_alloc",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_bytes_vec_alloc.rs"],
+ crate_root: "tests/test_bytes_vec_alloc.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -149,7 +151,7 @@
crate_name: "test_chain",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_chain.rs"],
+ crate_root: "tests/test_chain.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -174,7 +176,7 @@
crate_name: "test_debug",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_debug.rs"],
+ crate_root: "tests/test_debug.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -199,7 +201,7 @@
crate_name: "test_iter",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_iter.rs"],
+ crate_root: "tests/test_iter.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -224,7 +226,7 @@
crate_name: "test_reader",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_reader.rs"],
+ crate_root: "tests/test_reader.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -249,7 +251,7 @@
crate_name: "test_serde",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_serde.rs"],
+ crate_root: "tests/test_serde.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -274,7 +276,7 @@
crate_name: "test_take",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["tests/test_take.rs"],
+ crate_root: "tests/test_take.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -299,7 +301,7 @@
crate_name: "bytes",
cargo_env_compat: true,
cargo_pkg_version: "1.5.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2018",
features: [
"default",
@@ -309,11 +311,7 @@
rustlibs: ["libserde"],
apex_available: [
"//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.resolv",
- "com.android.uwb",
- "com.android.virt",
+ "//apex_available:anyapex",
],
product_available: true,
vendor_available: true,
diff --git a/cargo_embargo.json b/cargo_embargo.json
index f052496..57a41b3 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,11 +1,7 @@
{
"apex_available": [
"//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.resolv",
- "com.android.uwb",
- "com.android.virt"
+ "//apex_available:anyapex"
],
"features": [
"default",
