Migrate to cargo_embargo. am: b051631162
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/2832450
Change-Id: I67e247018f62d8d22ebc8544bcf84c02233f0293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 2c4a586..bcb28f8 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 {
@@ -50,64 +50,7 @@
unit_test: true,
},
edition: "2021",
- rustlibs: [
- "liblog_rust",
- ],
-}
-
-rust_defaults {
- name: "env_logger_test_defaults",
- crate_name: "env_logger",
- cargo_env_compat: true,
- cargo_pkg_version: "0.10.0",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2021",
- cfgs: ["test"],
- rustlibs: [
- "libenv_logger",
- "liblog_rust",
- ],
-}
-
-rust_test {
- name: "env_logger_test_tests_init-twice-retains-filter",
- defaults: ["env_logger_test_defaults"],
- host_supported: true,
- srcs: ["tests/init-twice-retains-filter.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "env_logger_test_tests_log-in-log",
- defaults: ["env_logger_test_defaults"],
- host_supported: true,
- srcs: ["tests/log-in-log.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "env_logger_test_tests_log_tls_dtors",
- defaults: ["env_logger_test_defaults"],
- host_supported: true,
- srcs: ["tests/log_tls_dtors.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "env_logger_test_tests_regexp_filter",
- defaults: ["env_logger_test_defaults"],
- host_supported: true,
- srcs: ["tests/regexp_filter.rs"],
- test_options: {
- unit_test: true,
- },
+ rustlibs: ["liblog_rust"],
}
rust_library {
@@ -118,9 +61,7 @@
cargo_pkg_version: "0.10.0",
srcs: ["src/lib.rs"],
edition: "2021",
- rustlibs: [
- "liblog_rust",
- ],
+ rustlibs: ["liblog_rust"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0fd666e..97113ac 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -62,35 +62,11 @@
"presubmit": [
{
"name": "env_logger_test_src_lib"
- },
- {
- "name": "env_logger_test_tests_init-twice-retains-filter"
- },
- {
- "name": "env_logger_test_tests_log-in-log"
- },
- {
- "name": "env_logger_test_tests_log_tls_dtors"
- },
- {
- "name": "env_logger_test_tests_regexp_filter"
}
],
"presubmit-rust": [
{
"name": "env_logger_test_src_lib"
- },
- {
- "name": "env_logger_test_tests_init-twice-retains-filter"
- },
- {
- "name": "env_logger_test_tests_log-in-log"
- },
- {
- "name": "env_logger_test_tests_log_tls_dtors"
- },
- {
- "name": "env_logger_test_tests_regexp_filter"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 16a029c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "//apex_available:anyapex"
- ],
- "dependencies": true,
- "device": true,
- "features": "",
- "min-sdk-version": "29",
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..08631a5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,5 @@
+{
+ "features": [],
+ "min_sdk_version": "29",
+ "tests": true
+}
