commit 3be4d2d758f19dc9159ef870ec44c65e2b3c3b6b
author Andrew Walbran <qwandor@google.com> Fri May 12 16:33:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 12 16:33:09 2023 +0000
tree 18e54538c3519d090abf406f41563b06a5ae5a76
parent ac443c695f698a6bcec03de0757dcb99a07e73a9
parent d4eff4d3b197961c5c13658c433e0bf6f9218a8f

Use new no-std flag to cargo2android. am: d4eff4d3b1

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

Change-Id: I51b4705f8081cd9f4bfa945af5aae7958edcb03b
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 b481e68..2155d28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,29 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.resolv",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "29",
+}
+
+rust_library_rlib {
+    name: "libtinyvec_nostd",
+    crate_name: "tinyvec",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.0",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
     ],
     product_available: true,
     vendor_available: true,
@@ -107,21 +129,3 @@
         unit_test: true,
     },
 }
-
-rust_library_rlib {
-    name: "libtinyvec_nostd",
-    crate_name: "tinyvec",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.5.1",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    prefer_rlib: true,
-    no_stdlibs: true,
-    stdlibs: [
-        "libcompiler_builtins.rust_sysroot",
-        "libcore.rust_sysroot",
-    ],
-    vendor_available: true,
-    min_sdk_version: "29",
-}
-

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 811fadf..d3ea6e6 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,13 +1,19 @@
 {
-  "add-toplevel-block": "cargo2android_nostd.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
   "dependencies": true,
   "device": true,
-  "features": "alloc,default,std,tinyvec_macros",
   "min-sdk-version": "29",
   "run": true,
-  "tests": true
+  "variants": [
+    {
+      "features": "alloc,default,std,tinyvec_macros",
+      "tests": true
+    },
+    {
+      "features": "",
+      "force-rlib": true,
+      "no-host": true,
+      "suffix": "_nostd",
+      "no-std": true
+    }
+  ]
 }
\ No newline at end of file

cargo2android_nostd.bp

diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
deleted file mode 100644
index d18c622..0000000
--- a/cargo2android_nostd.bp
+++ /dev/null
@@ -1,16 +0,0 @@
-rust_library_rlib {
-    name: "libtinyvec_nostd",
-    crate_name: "tinyvec",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.5.1",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    prefer_rlib: true,
-    no_stdlibs: true,
-    stdlibs: [
-        "libcompiler_builtins.rust_sysroot",
-        "libcore.rust_sysroot",
-    ],
-    vendor_available: true,
-    min_sdk_version: "29",
-}