Use new no-std flag to cargo2android.
Bug: 279614907
Test: Ran cargo2android and compared Android.bp
Change-Id: Iacf967b528194b74d99bdcbc05f11cdb2da82281
diff --git a/Android.bp b/Android.bp
index 1610254..530da7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,6 +46,10 @@
srcs: ["src/lib.rs"],
edition: "2021",
features: ["alloc"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
prefer_rlib: true,
no_stdlibs: true,
stdlibs: [
@@ -53,8 +57,6 @@
"libcompiler_builtins.rust_sysroot",
"libcore.rust_sysroot",
],
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
index eb19901..429052c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,18 @@
{
- "add-toplevel-block": "cargo2android_nostd.bp",
"device": true,
- "features": "alloc,std,",
"run": true,
"dependencies": true,
- "vendor-available": true
+ "variants": [
+ {
+ "features": "alloc,std"
+ },
+ {
+ "alloc": true,
+ "features": "alloc",
+ "force-rlib": true,
+ "no-host": true,
+ "suffix": "_nostd",
+ "no-std": true
+ }
+ ]
}
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
deleted file mode 100644
index 9712ce9..0000000
--- a/cargo2android_nostd.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-rust_library_rlib {
- name: "libciborium_io_nostd",
- crate_name: "ciborium_io",
- cargo_env_compat: true,
- cargo_pkg_version: "0.2.0",
- srcs: ["src/lib.rs"],
- edition: "2021",
- features: ["alloc"],
- prefer_rlib: true,
- no_stdlibs: true,
- stdlibs: [
- "liballoc.rust_sysroot",
- "libcompiler_builtins.rust_sysroot",
- "libcore.rust_sysroot",
- ],
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
