Snap for 8564071 from 9bb28b798d80f1a68feb9b2bc82b69ba23fb829a to mainline-conscrypt-release
Change-Id: I3fc06252af41e533902e45e6a7705b1846f7cdd2
diff --git a/Android.bp b/Android.bp
index 6b91766..e96d563 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,8 @@
// has rustc warnings
host_supported: true,
crate_name: "log",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.4.14",
srcs: ["src/lib.rs"],
edition: "2015",
features: ["std"],
@@ -57,8 +59,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ vendor_available: true,
min_sdk_version: "29",
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1b7b681..244ce47 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,56 +1,198 @@
// 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/env_logger"
+ },
+ {
+ "path": "external/rust/crates/futures-util"
+ },
+ {
+ "path": "external/rust/crates/gdbstub_arch"
+ },
+ {
+ "path": "external/rust/crates/jni"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/mio"
+ },
+ {
+ "path": "external/rust/crates/quiche"
+ },
+ {
+ "path": "external/rust/crates/quickcheck"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ },
+ {
+ "path": "external/rust/crates/serde-xml-rs"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/tokio-test"
+ }
+ ],
"presubmit": [
{
- "name": "env_logger_device_test_tests_regexp_filter"
+ "name": "ZipFuseTest"
},
{
- "name": "env_logger_device_test_tests_log-in-log"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "tokio-test_device_test_tests_macros"
+ "name": "diced_open_dice_cbor_test"
},
{
- "name": "keystore2_test"
+ "name": "diced_sample_inputs_test"
},
{
- "name": "vpnprofilestore_test"
+ "name": "diced_test"
},
{
- "name": "tokio-test_device_test_src_lib"
+ "name": "diced_utils_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "diced_vendor_test"
},
{
- "name": "keystore2_selinux_test"
- },
- {
- "name": "android_logger_device_test_src_lib"
- },
- {
- "name": "env_logger_device_test_tests_log_tls_dtors"
- },
- {
- "name": "tokio-test_device_test_tests_block_on"
- },
- {
- "name": "futures-util_device_test_src_lib"
- },
- {
- "name": "tokio-test_device_test_tests_io"
+ "name": "doh_unit_test"
},
{
"name": "keystore2_crypto_test_rust"
},
{
- "name": "env_logger_device_test_src_lib"
+ "name": "keystore2_selinux_concurrency_test"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "keystore2_selinux_test"
},
{
- "name": "env_logger_device_test_tests_init-twice-retains-filter"
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_test_utils_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.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": "microdroid_manager_test"
+ },
+ {
+ "name": "rustBinderTest"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "diced_open_dice_cbor_test"
+ },
+ {
+ "name": "diced_sample_inputs_test"
+ },
+ {
+ "name": "diced_test"
+ },
+ {
+ "name": "diced_utils_test"
+ },
+ {
+ "name": "diced_vendor_test"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
+ "name": "keystore2_crypto_test_rust"
+ },
+ {
+ "name": "keystore2_selinux_concurrency_test"
+ },
+ {
+ "name": "keystore2_selinux_test"
+ },
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_test_utils_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.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": "microdroid_manager_test"
+ },
+ {
+ "name": "rustBinderTest"
+ },
+ {
+ "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 723587f..11f62b6 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,5 +7,6 @@
"device": true,
"features": "std",
"min-sdk-version": "29",
- "run": true
+ "run": true,
+ "vendor-available": true
}
\ No newline at end of file
