Add apex_available. am: b031bf4e15
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_logger/+/1897761
Change-Id: Ia946a043008c19b6c4eba8e85787a02d34aa1088
diff --git a/Android.bp b/Android.bp
index 337489b..8f631a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@
rust_test {
name: "android_logger_device_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",
@@ -79,28 +83,29 @@
rust_test {
name: "android_logger_device_test_tests_config_log_level",
- defaults: ["android_logger_defaults"],
+ 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"],
+ defaults: ["android_logger_test_defaults"],
srcs: ["tests/default_init.rs"],
}
rust_test {
name: "android_logger_device_test_tests_multiple_init",
- defaults: ["android_logger_defaults"],
+ 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",
- vendor_available: true,
features: [
"default",
"regex",
@@ -115,18 +120,9 @@
"//apex_available:platform",
"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.18 "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.4.0 "default,std"
-// regex-1.5.4 "aho-corasick,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std"
-// regex-syntax-0.6.25
diff --git a/cargo2android.json b/cargo2android.json
index f681dd9..ef082bb 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,6 +3,7 @@
"//apex_available:platform",
"com.android.compos",
"com.android.resolv",
+ "com.android.uwb",
"com.android.virt"
],
"min_sdk_version": "29",
