aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-11-22 17:41:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-22 17:41:59 +0000
commitcbf8f813b4b64028d83427f81e4d83e82aded3fe (patch)
tree75e61692cdf9a93d6de79a9a9c055b1812e2bb0d
parentcfe9bb98b2c4bcd805bfb1aa5c2286cfb583c5a1 (diff)
parent966e63a4826c386d5bf185fb135793a557c9ecaf (diff)
downloadtokio-cbf8f813b4b64028d83427f81e4d83e82aded3fe.tar.gz
Add apex_available. am: a9123a9ae9 am: 00f8918c59 am: 86e21fc524 am: 966e63a482
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1897833 Change-Id: I2e08d30cf68519c40b8cc384c1ec02ab9ebaf777
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json3
2 files changed, 4 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index a89c568..7c4688c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,7 @@ rust_library {
host_supported: true,
crate_name: "tokio",
cargo_env_compat: true,
- cargo_pkg_version: "1.12.0",
+ cargo_pkg_version: "1.14.0",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -56,6 +56,7 @@ rust_library {
apex_available: [
"//apex_available:platform",
"com.android.resolv",
+ "com.android.uwb",
],
min_sdk_version: "29",
}
diff --git a/cargo2android.json b/cargo2android.json
index c715d16..439011b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,7 +2,8 @@
"add-toplevel-block": "cargo2android_tests.bp",
"apex-available": [
"//apex_available:platform",
- "com.android.resolv"
+ "com.android.resolv",
+ "com.android.uwb"
],
"min_sdk_version": "29",
"features": "io-util,macros,rt-multi-thread,sync,net,fs,time",