Snap for 8191477 from 5d7545beb733ff003c0eed9693bf3e1e6eb92e3b to tm-frc-resolv-release
Change-Id: Id3390162b88221612b43eca15b9546d502bbcf17
diff --git a/Android.bp b/Android.bp
index d156d87..056c310 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,8 +40,10 @@
}
rust_test {
- name: "android_logger_device_test_src_lib",
+ name: "android_logger_test_src_lib",
crate_name: "android_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.10.1",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -59,8 +61,10 @@
}
rust_defaults {
- name: "android_logger_defaults",
+ name: "android_logger_test_defaults",
crate_name: "android_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.10.1",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -78,26 +82,28 @@
}
rust_test {
- name: "android_logger_device_test_tests_config_log_level",
- defaults: ["android_logger_defaults"],
+ name: "android_logger_test_tests_config_log_level",
+ defaults: ["android_logger_test_defaults"],
srcs: ["tests/config_log_level.rs"],
}
rust_test {
- name: "android_logger_device_test_tests_default_init",
- defaults: ["android_logger_defaults"],
+ name: "android_logger_test_tests_default_init",
+ defaults: ["android_logger_test_defaults"],
srcs: ["tests/default_init.rs"],
}
rust_test {
- name: "android_logger_device_test_tests_multiple_init",
- defaults: ["android_logger_defaults"],
+ name: "android_logger_test_tests_multiple_init",
+ defaults: ["android_logger_test_defaults"],
srcs: ["tests/multiple_init.rs"],
}
rust_library {
name: "libandroid_logger",
crate_name: "android_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.10.1",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -112,19 +118,12 @@
],
apex_available: [
"//apex_available:platform",
+ "com.android.bluetooth",
+ "com.android.compos",
"com.android.resolv",
+ "com.android.uwb",
"com.android.virt",
],
+ vendor_available: true,
min_sdk_version: "29",
}
-
-// dependent_library ["feature_list"]
-// aho-corasick-0.7.15 "default,std"
-// android_log-sys-0.2.0
-// cfg-if-1.0.0
-// env_logger-0.8.3 "regex"
-// lazy_static-1.4.0
-// log-0.4.14 "std"
-// memchr-2.3.4 "default,std,use_std"
-// regex-1.4.6 "aho-corasick,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std"
-// regex-syntax-0.6.23
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 813e886..7fc7922 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,40 +2,102 @@
{
"presubmit": [
{
- "name": "android_logger_device_test_src_lib"
+ "name": "android_logger_test_src_lib"
},
{
- "name": "android_logger_device_test_tests_config_log_level"
+ "name": "android_logger_test_tests_config_log_level"
},
{
- "name": "android_logger_device_test_tests_default_init"
+ "name": "android_logger_test_tests_default_init"
},
{
- "name": "android_logger_device_test_tests_multiple_init"
+ "name": "android_logger_test_tests_multiple_init"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
},
{
"name": "doh_unit_test"
},
{
+ "name": "keystore2_selinux_concurrency_test"
+ },
+ {
"name": "keystore2_selinux_test"
},
{
"name": "keystore2_test"
},
{
- "name": "logger_device_test_config_log_level"
+ "name": "logger_device_unit_tests"
},
{
- "name": "logger_device_test_default_init"
+ "name": "logger_test_config_log_level"
},
{
- "name": "logger_device_test_env_log_level"
+ "name": "logger_test_default_init"
},
{
- "name": "logger_device_test_multiple_init"
+ "name": "logger_test_env_log_level"
+ },
+ {
+ "name": "logger_test_multiple_init"
+ },
+ {
+ "name": "open_then_run_module"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "android_logger_test_src_lib"
+ },
+ {
+ "name": "android_logger_test_tests_config_log_level"
+ },
+ {
+ "name": "android_logger_test_tests_default_init"
+ },
+ {
+ "name": "android_logger_test_tests_multiple_init"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
+ "name": "keystore2_selinux_concurrency_test"
+ },
+ {
+ "name": "keystore2_selinux_test"
+ },
+ {
+ "name": "keystore2_test"
},
{
"name": "logger_device_unit_tests"
+ },
+ {
+ "name": "logger_test_config_log_level"
+ },
+ {
+ "name": "logger_test_default_init"
+ },
+ {
+ "name": "logger_test_env_log_level"
+ },
+ {
+ "name": "logger_test_multiple_init"
+ },
+ {
+ "name": "open_then_run_module"
+ },
+ {
+ "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index d02b87d..18ba06d 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,13 +1,17 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.bluetooth",
+ "com.android.compos",
"com.android.resolv",
+ "com.android.uwb",
"com.android.virt"
],
- "min_sdk_version": "29",
"dependencies": true,
"device": true,
+ "min-sdk-version": "29",
"no-host": true,
"run": true,
- "tests": true
-}
\ No newline at end of file
+ "tests": true,
+ "vendor-available": true
+}
