aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-11-22 17:27:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-22 17:27:17 +0000
commitc58dc381be1e49a4f90d1297f0ee35a461dc900c (patch)
tree26e68fec5d009c88cb0d4433871115c2cf54eea1
parent3753eb580326aee93612dd06a2b88548483ae950 (diff)
parent034e6690f997ab06f515b26eae6c8fbaeed6a959 (diff)
downloadenv_logger-c58dc381be1e49a4f90d1297f0ee35a461dc900c.tar.gz
Add apex_available. am: c84b5620b7 am: e7ab7a7cc5 am: 034e6690f9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1897832 Change-Id: Id219e8ab0f715969cb9fe8a00ee7d2700d775bd9
-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",