aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2023-02-24 23:49:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-24 23:49:12 +0000
commitc7d102c4a99d6f86db054001adc4ab50dfc40440 (patch)
treede03e1d269ed86cff9d7e4ffbcc09e478f02b7dd
parentb196e7ff8bb502d413254e34232e73923d7813c7 (diff)
parent0eff490b5c589c94438d1c7978cd671d03a8121c (diff)
downloaduuid-c7d102c4a99d6f86db054001adc4ab50dfc40440.tar.gz
Add no_std library am: a7bbe58586 am: 0eff490b5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/uuid/+/2427481 Change-Id: Ifb347193bcabff2ece56a288b773fb28b4bd7eb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp16
-rw-r--r--cargo2android.json1
-rw-r--r--cargo2android_nostd.bp17
3 files changed, 34 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 7feffa5..2f631a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,3 +62,19 @@ rust_library {
"com.android.virt",
],
}
+
+rust_library_rlib {
+ name: "libuuid_nostd",
+ crate_name: "uuid",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.2",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+}
+
diff --git a/cargo2android.json b/cargo2android.json
index 21b1d6c..8e77693 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
{
+ "add-toplevel-block": "cargo2android_nostd.bp",
"apex-available": [
"//apex_available:platform",
"com.android.virt"
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..da60055
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,17 @@
+rust_library_rlib {
+ name: "libuuid_nostd",
+ crate_name: "uuid",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.2",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ features: [
+ "macro-diagnostics",
+ ],
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+}