aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-12 01:03:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-12 01:03:53 +0000
commit6300de4e3cce2de7421dd04a4284d643b8d2d081 (patch)
tree15595e8c924d6e443932d730440eea17ee3d1568
parent9b6c32164d8c40bc60682f94ba02dbb93bc7898c (diff)
parent9832e10f9103bbef6b603bad9ade251f2592e564 (diff)
downloadciborium-ll-android14-gsi.tar.gz
Snap for 10113759 from 404166a074d37bf4dde3bcf41b6bda08912a3cbc to udc-release am: 9832e10f91android14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/ciborium-ll/+/23185835 Change-Id: Id68667d99f1ff29cd0f47f936b54652ae1491e1e 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",
+ ],
+}