commit f46f59f8fcb9427c3cf0dd81b1d91f78aea298b8
author Pierre-Clément Tosi <ptosi@google.com> Sat Feb 25 01:46:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 25 01:46:48 2023 +0000
tree de03e1d269ed86cff9d7e4ffbcc09e478f02b7dd
parent e91e096e221dc9444fd4e71487185eed4399d407
parent 183b1e33cc4ce407c93aa09c0ff731b4aaa5554f

Add no_std library am: a7bbe58586 am: 0eff490b5c am: c7d102c4a9 am: 183b1e33cc

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/uuid/+/2427481

Change-Id: I1d9ae4e1b71e5e09af9a8dcecc34c69bb9dc793e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 7feffa5..2f631a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,3 +62,19 @@
         "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",
+    ],
+}
+

cargo2android.json

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"

cargo2android_nostd.bp

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",
+    ],
+}