aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2023-04-25 20:39:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-25 20:39:08 +0000
commitf5ad4687d0230861b9cb55bf8823266d98004aba (patch)
tree15595e8c924d6e443932d730440eea17ee3d1568
parent3294756aa23f366282ab4710e953e32556a51f8a (diff)
parentd183493595393f1595ec48dec1aaa08ab00dbbe2 (diff)
downloadciborium-ll-f5ad4687d0230861b9cb55bf8823266d98004aba.tar.gz
Create no_std builds of ciborium and dependencies am: 7437881bf5 am: 28d7094ce3 am: de11e0b6f0 am: 75bbdcd10e am: d183493595
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-ll/+/2557650 Change-Id: Ibac663ca08f33be0413f8b83a270e4cd40eeddeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp19
-rw-r--r--cargo2android.json1
-rw-r--r--cargo2android_nostd.bp18
3 files changed, 38 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 30b1224..2e835b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,3 +57,22 @@ rust_library {
product_available: true,
vendor_available: true,
}
+
+rust_library_rlib {
+ name: "libciborium_ll_nostd",
+ crate_name: "ciborium_ll",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.0",
+ srcs: ["src/lib.rs"],
+ edition: "2021",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ rustlibs: [
+ "libciborium_io_nostd",
+ "libhalf_nostd",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+}
diff --git a/cargo2android.json b/cargo2android.json
index cf7ea4a..e7673ba 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
{
+ "add-toplevel-block": "cargo2android_nostd.bp",
"device": true,
"run": true,
"dependencies": true,
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..9912edd
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,18 @@
+rust_library_rlib {
+ name: "libciborium_ll_nostd",
+ crate_name: "ciborium_ll",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.0",
+ srcs: ["src/lib.rs"],
+ edition: "2021",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ rustlibs: [
+ "libciborium_io_nostd",
+ "libhalf_nostd",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+}