Snap for 8191477 from 1d0f664a54562dca18474e3f8889226076dc9454 to tm-frc-ipsec-release
Change-Id: Ie1ffea071e411360c8ccf8c380bdee51d6b1eebc
diff --git a/Android.bp b/Android.bp
index 268bd8f..812d4e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,18 +43,24 @@
name: "libandroid_log_sys",
host_supported: true,
crate_name: "android_log_sys",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.0",
srcs: ["src/lib.rs"],
edition: "2015",
+ 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",
target: {
linux_glibc: {
// liblog is not added as a dependency for linux_glibc target
enabled: false,
},
},
- apex_available: [
- "//apex_available:platform",
- "com.android.resolv",
- "com.android.virt",
- ],
- min_sdk_version: "29",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index dabccd6..37d7815 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,90 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/android_logger"
+ }
+ ],
"presubmit": [
{
- "name": "android_logger_device_test_src_lib"
+ "name": "ZipFuseTest"
+ },
+ {
+ "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"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "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 80540e9..f07ebe4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,12 +1,16 @@
{
+ "add-module-block": "cargo2android_glibc.bp",
"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,
- "patch": "patches/Android.bp.patch",
- "run": true
-}
\ No newline at end of file
+ "min-sdk-version": "29",
+ "run": true,
+ "vendor-available": true
+}
diff --git a/cargo2android_glibc.bp b/cargo2android_glibc.bp
new file mode 100644
index 0000000..f4d25cf
--- /dev/null
+++ b/cargo2android_glibc.bp
@@ -0,0 +1,6 @@
+target: {
+ linux_glibc: {
+ // liblog is not added as a dependency for linux_glibc target
+ enabled: false,
+ },
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 988834c..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Android.bp
-+++ b/Android.bp
-@@ -45,6 +45,12 @@ rust_library {
- crate_name: "android_log_sys",
- srcs: ["src/lib.rs"],
- edition: "2015",
-+ target: {
-+ linux_glibc: {
-+ // liblog is not added as a dependency for linux_glibc target
-+ enabled: false,
-+ },
-+ },
- apex_available: [
- "//apex_available:platform",
- "com.android.resolv",
