Snap for 10453563 from 5bd33a91acf70c682b185d58356818f4c51e88cb to mainline-tzdata5-release
Change-Id: Ie2cf7b5dc16435438ec0a910bb6e282620dbca25
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",
+ ],
+}
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
+}
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",
+ ],
+}