commit c48d7d510bc3b302a8a815e32177ff8248e73afd
author Xin Li <delphij@google.com> Wed Nov 10 08:05:38 2021 +0000
committer Xin Li <delphij@google.com> Wed Nov 10 08:05:38 2021 +0000
tree 9fa84f9b0ddd848a9d999f108a354d01f6e57eaf
parent ecbbe1e3ed07028b5496d5393c75b34565ee4edf
parent 4896a1af26cb6d9c565e504c7afc2969eb4d1bea

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I4a69f3309a090ee00334cd13a65063ffc27cdd1b
Change-Id: I00a3eb5df5581e570265a98611765170c1111876

Android.bp

diff --git a/Android.bp b/Android.bp
index 8118506..5cd98d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@
     name: "librand",
     host_supported: true,
     crate_name: "rand",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.4",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -51,6 +53,7 @@
         "libc",
         "rand_chacha",
         "rand_hc",
+        "small_rng",
         "std",
         "std_rng",
     ],
@@ -59,12 +62,8 @@
         "librand_chacha",
         "librand_core",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
-
-// dependent_library ["feature_list"]
-//   cfg-if-1.0.0
-//   getrandom-0.2.3 "std"
-//   libc-0.2.97
-//   ppv-lite86-0.2.10 "simd,std"
-//   rand_chacha-0.3.1 "std"
-//   rand_core-0.6.3 "alloc,getrandom,std"

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 1b6cca2..f2dbe12 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,10 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "dependencies": true,
   "device": true,
-  "run": true
-}
\ No newline at end of file
+  "run": true,
+  "features": "default,small_rng"
+}