commit be22224c1f9bdbf2f88b5444f7e33407d03c0d83
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 11 23:21:57 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 11 23:21:57 2023 +0000
tree 2d41440de78728e182162a06c9cfff7b380c164d
parent ea668000b778f91b5c842d0855d890aac37d260d
parent 8cd9cd14689ccf4e1f0885a24c98d8317883fdd2

Snap for 10113759 from 8cd9cd14689ccf4e1f0885a24c98d8317883fdd2 to udc-release

Change-Id: I091852735571e811c85d73a5b33db095b8264a8e

Android.bp

diff --git a/Android.bp b/Android.bp
index 12334aa..48ad351 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,8 +52,31 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
     product_available: true,
     vendor_available: true,
 }
+
+rust_library_rlib {
+    name: "libhalf_nostd",
+    crate_name: "half",
+    cargo_env_compat: true,
+    cargo_pkg_version: "2.2.1",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "liballoc.rust_sysroot",
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
+    features: [
+        "alloc",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 84618e2..2f73971 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,6 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
+  "add-toplevel-block": "cargo2android_nostd.bp",
   "device": true,
   "run": true,
   "vendor-available": true
-}
\ No newline at end of file
+}

cargo2android_nostd.bp

diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..db81b1a
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,22 @@
+rust_library_rlib {
+    name: "libhalf_nostd",
+    crate_name: "half",
+    cargo_env_compat: true,
+    cargo_pkg_version: "2.2.1",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "liballoc.rust_sysroot",
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
+    features: [
+        "alloc",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}