summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-05-05 20:56:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-05 20:56:32 +0000
commitf8698632319d84c313a2883097dc107632741ffc (patch)
treeef75f400ad3ff8a469b90596428836a28f3fe284
parentc508d04d2b8e9006e51147575cac0b31553a7231 (diff)
parent6d125d762d16b3717e21f980e2987c2a70322c4f (diff)
downloadthreadpool-f8698632319d84c313a2883097dc107632741ffc.tar.gz
Make available for use on device. am: ddf0460a9d am: a7593275b6 am: 29d404661d am: 2ef5b93229 am: 6d125d762d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/threadpool/+/2578380 Change-Id: Ia19f58f406ecc43daa13d57f7d65f42b6431546c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp9
-rw-r--r--cargo2android.json6
2 files changed, 10 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index da493f3..3372a0a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// 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_threadpool_license"],
}
@@ -20,9 +18,10 @@ license {
],
}
-rust_library_host {
+rust_library {
name: "libthreadpool",
// has rustc warnings
+ host_supported: true,
crate_name: "threadpool",
cargo_env_compat: true,
cargo_pkg_version: "1.8.1",
@@ -31,6 +30,10 @@ rust_library_host {
rustlibs: [
"libnum_cpus",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
product_available: true,
vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
index 1d33ddd..1b6cca2 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,3 +1,5 @@
{
- "run": true
-}
+ "dependencies": true,
+ "device": true,
+ "run": true
+} \ No newline at end of file