aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2022-11-29 00:40:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-11-29 00:40:45 +0000
commit7bbc70bda7fce578aa2c20fddfb07f8f87bc9d54 (patch)
tree01d087b988302c9f280f90279f524bcf7d7f0194
parent604523b69ab67c7bad0fa0590d1aad872e3a7685 (diff)
parentfe2507000dadd52b96daec114ebb7c5c1b432dc0 (diff)
downloadtinyvec-7bbc70bda7fce578aa2c20fddfb07f8f87bc9d54.tar.gz
Add 'no_std' variant of the crate am: 6c02bf1e80 am: 65747c2647 am: fe2507000d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/2318990 Change-Id: Ic3415c9948469be6a007fe7bd81003ee8bea26bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp18
-rw-r--r--cargo2android.json1
-rw-r--r--cargo2android_nostd.bp16
3 files changed, 35 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 3f35105..65d78b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,3 +105,21 @@ rust_test {
unit_test: true,
},
}
+
+rust_library_rlib {
+ name: "libtinyvec_nostd",
+ crate_name: "tinyvec",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.1",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ vendor_available: true,
+ min_sdk_version: "29",
+}
+
diff --git a/cargo2android.json b/cargo2android.json
index a94ae9e..811fadf 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
{
+ "add-toplevel-block": "cargo2android_nostd.bp",
"apex-available": [
"//apex_available:platform",
"com.android.resolv"
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..d18c622
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,16 @@
+rust_library_rlib {
+ name: "libtinyvec_nostd",
+ crate_name: "tinyvec",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.1",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ vendor_available: true,
+ min_sdk_version: "29",
+}