aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-11-30 20:33:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-30 20:33:24 +0000
commit8c3a49783175022e5a1a3d6a95e6deab36a2781b (patch)
tree68ae9903db4f572e5ea6388cdecf53b12e4e5045
parentacc37b4e426c08995420fe0d5a2e5a6692766971 (diff)
parentefb74b1650915e44fe2f721dce3b282a2a017b6c (diff)
downloadasync-task-8c3a49783175022e5a1a3d6a95e6deab36a2781b.tar.gz
Fix incorrect cargo2android.py invocation. am: efb74b1650
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-task/+/1906970 Change-Id: I359c3fa079994308ba44676e2fd4197dd438ed4d
-rw-r--r--Android.bp9
-rw-r--r--cargo2android.json8
2 files changed, 14 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index b1393c7..0b36523 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_async-task_license"],
@@ -38,16 +39,18 @@ license {
rust_library {
name: "libasync_task",
+ host_supported: true,
crate_name: "async_task",
+ cargo_env_compat: true,
+ cargo_pkg_version: "4.0.3",
srcs: ["src/lib.rs"],
edition: "2018",
- host_supported: true,
features: [
"default",
"std",
],
apex_available: [
"//apex_available:platform",
- "com.android.virt",
+ "com.android.virt",
],
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..707d26c
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,8 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true
+} \ No newline at end of file