aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2023-04-25 17:06:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-25 17:06:32 +0000
commit903858f9df2f725d4a8c104900b21b918c268151 (patch)
tree2d41440de78728e182162a06c9cfff7b380c164d
parentfffa7531fac641e7d9d5447a1c872c398389c4cd (diff)
parente75ca0f5ad434878c3f92a9b35e8cd3067ea91f1 (diff)
downloadhalf-903858f9df2f725d4a8c104900b21b918c268151.tar.gz
Create no_std builds of ciborium and dependencies am: 03842cff6f am: 2263cfa5fc am: e75ca0f5ad
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/half/+/2557333 Change-Id: I4ff1fbc7e09f8f5b779f1b648508e88634f657a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp25
-rw-r--r--cargo2android.json7
-rw-r--r--cargo2android_nostd.bp22
3 files changed, 48 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 12334aa..48ad351 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,8 +52,31 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.virt",
+ "//apex_available:anyapex",
],
product_available: true,
vendor_available: true,
}
+
+rust_library_rlib {
+ name: "libhalf_nostd",
+ crate_name: "half",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.2.1",
+ srcs: ["src/lib.rs"],
+ edition: "2021",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "liballoc.rust_sysroot",
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ features: [
+ "alloc",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+}
diff --git a/cargo2android.json b/cargo2android.json
index 84618e2..2f73971 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,6 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
+ "add-toplevel-block": "cargo2android_nostd.bp",
"device": true,
"run": true,
"vendor-available": true
-} \ No newline at end of file
+}
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..db81b1a
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,22 @@
+rust_library_rlib {
+ name: "libhalf_nostd",
+ crate_name: "half",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.2.1",
+ srcs: ["src/lib.rs"],
+ edition: "2021",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "liballoc.rust_sysroot",
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ features: [
+ "alloc",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+}