Merge "Adding bluetooth apex"
diff --git a/Android.bp b/Android.bp
index 57506e1..b08c70d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,34 +37,29 @@
],
}
-rust_defaults {
- name: "env_logger_test_defaults",
+rust_test {
+ name: "env_logger_test_src_lib",
+ host_supported: true,
crate_name: "env_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.0",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
rustlibs: [
"liblog_rust",
],
}
-rust_test_host {
- name: "env_logger_host_test_src_lib",
- defaults: ["env_logger_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "env_logger_device_test_src_lib",
- defaults: ["env_logger_test_defaults"],
-}
-
rust_defaults {
- name: "env_logger_test_defaults_env_logger",
+ name: "env_logger_test_defaults",
crate_name: "env_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -75,9 +70,10 @@
],
}
-rust_test_host {
- name: "env_logger_host_test_tests_init-twice-retains-filter",
- defaults: ["env_logger_test_defaults_env_logger"],
+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,
@@ -85,14 +81,9 @@
}
rust_test {
- name: "env_logger_device_test_tests_init-twice-retains-filter",
- defaults: ["env_logger_test_defaults_env_logger"],
- srcs: ["tests/init-twice-retains-filter.rs"],
-}
-
-rust_test_host {
- name: "env_logger_host_test_tests_log-in-log",
- defaults: ["env_logger_test_defaults_env_logger"],
+ 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,
@@ -100,14 +91,9 @@
}
rust_test {
- name: "env_logger_device_test_tests_log-in-log",
- defaults: ["env_logger_test_defaults_env_logger"],
- srcs: ["tests/log-in-log.rs"],
-}
-
-rust_test_host {
- name: "env_logger_host_test_tests_log_tls_dtors",
- defaults: ["env_logger_test_defaults_env_logger"],
+ 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,
@@ -115,31 +101,21 @@
}
rust_test {
- name: "env_logger_device_test_tests_log_tls_dtors",
- defaults: ["env_logger_test_defaults_env_logger"],
- srcs: ["tests/log_tls_dtors.rs"],
-}
-
-rust_test_host {
- name: "env_logger_host_test_tests_regexp_filter",
- defaults: ["env_logger_test_defaults_env_logger"],
+ 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,
},
}
-rust_test {
- name: "env_logger_device_test_tests_regexp_filter",
- defaults: ["env_logger_test_defaults_env_logger"],
- srcs: ["tests/regexp_filter.rs"],
-}
-
rust_library {
name: "libenv_logger",
host_supported: true,
- vendor_available: true,
crate_name: "env_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.0",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -150,11 +126,9 @@
"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"]
-// cfg-if-1.0.0
-// log-0.4.14 "std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 18638bf..e8284bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,38 +1,49 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/android_logger"
+ },
+ {
+ "path": "external/rust/crates/cast"
+ },
+ {
+ "path": "external/rust/crates/crc32fast"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/mio"
+ },
+ {
+ "path": "external/rust/crates/quickcheck"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ }
+ ],
"presubmit": [
{
- "name": "android_logger_device_test_src_lib"
- },
- {
- "name": "android_logger_device_test_tests_config_log_level"
- },
- {
- "name": "android_logger_device_test_tests_default_init"
- },
- {
- "name": "android_logger_device_test_tests_multiple_init"
- },
- {
"name": "authfs_device_test_src_lib"
},
{
"name": "doh_unit_test"
},
{
- "name": "env_logger_device_test_src_lib"
+ "name": "env_logger_test_src_lib"
},
{
- "name": "env_logger_device_test_tests_init-twice-retains-filter"
+ "name": "env_logger_test_tests_init-twice-retains-filter"
},
{
- "name": "env_logger_device_test_tests_log-in-log"
+ "name": "env_logger_test_tests_log-in-log"
},
{
- "name": "env_logger_device_test_tests_log_tls_dtors"
+ "name": "env_logger_test_tests_log_tls_dtors"
},
{
- "name": "env_logger_device_test_tests_regexp_filter"
+ "name": "env_logger_test_tests_regexp_filter"
},
{
"name": "keystore2_selinux_concurrency_test"
@@ -47,27 +58,80 @@
"name": "legacykeystore_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "logger_device_unit_tests"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "logger_test_config_log_level"
},
{
- "name": "logger_device_test_config_log_level"
+ "name": "logger_test_default_init"
},
{
- "name": "logger_device_test_default_init"
+ "name": "logger_test_env_log_level"
},
{
- "name": "logger_device_test_env_log_level"
+ "name": "logger_test_multiple_init"
},
{
- "name": "logger_device_test_multiple_init"
+ "name": "open_then_run_module"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
+ "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"
+ },
+ {
+ "name": "keystore2_selinux_concurrency_test"
+ },
+ {
+ "name": "keystore2_selinux_test"
+ },
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_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 dbfa739..98d8431 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,13 +4,14 @@
"com.android.bluetooth",
"com.android.compos",
"com.android.resolv",
+ "com.android.uwb",
"com.android.virt"
],
- "min_sdk_version": "29",
"dependencies": true,
- "vendor_available": true,
"device": true,
"features": "",
+ "min-sdk-version": "29",
"run": true,
- "tests": true
-}
+ "tests": true,
+ "vendor-available": true
+}
\ No newline at end of file
