aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-23 02:05:04 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-23 02:05:04 +0000
commite5f4a421d8fc76753cc6c08b14dc8bc0eedfe5d4 (patch)
tree26e68fec5d009c88cb0d4433871115c2cf54eea1
parentc983b275c26bb5a6bff62c84027bf03dec688099 (diff)
parent7a65bd15a74dcc86d88f74fbaa32d56e728fc942 (diff)
downloadenv_logger-e5f4a421d8fc76753cc6c08b14dc8bc0eedfe5d4.tar.gz
Snap for 7938361 from 7a65bd15a74dcc86d88f74fbaa32d56e728fc942 to tm-release
Change-Id: Ic866fccf14b298b8a82a1562eac660c2f14ea199
-rw-r--r--Android.bp13
-rw-r--r--cargo2android.json1
2 files changed, 9 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index b068420..97eb8c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ rust_defaults {
name: "env_logger_test_defaults",
crate_name: "env_logger",
srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -65,6 +67,8 @@ rust_test {
rust_defaults {
name: "env_logger_test_defaults_env_logger",
crate_name: "env_logger",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -138,8 +142,9 @@ rust_test {
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: [
@@ -149,11 +154,9 @@ rust_library {
"//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"]
-// cfg-if-1.0.0
-// log-0.4.14 "std"
diff --git a/cargo2android.json b/cargo2android.json
index 0d7e33a..49580fa 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",