aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 14:56:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 14:56:02 +0000
commit1bfc4d852d150d8f0a6203e37f163c0a1deda507 (patch)
treeb0c544c71429c5a4d2e61f67bffc4483f9c1e7fa
parent6180d1b39870ea522279510fbeb086ee2a13c5ee (diff)
parentaf951efc675217924d15f1b40d3359130862622d (diff)
downloadcoset-1bfc4d852d150d8f0a6203e37f163c0a1deda507.tar.gz
Enable std feature in cargo2android.json. am: 36fefb90a2 am: af951efc67
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/coset/+/2822522 Change-Id: Iea650d89b2617091287fe9308c01134b537004a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json1
2 files changed, 9 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index b717dcc..971f1fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,10 @@ rust_test {
unit_test: true,
},
edition: "2018",
- features: ["std"],
+ features: [
+ "default",
+ "std",
+ ],
rustlibs: [
"libciborium",
"libciborium_io",
@@ -47,7 +50,10 @@ rust_library {
cargo_pkg_version: "0.3.5",
srcs: ["src/lib.rs"],
edition: "2018",
- features: ["std"],
+ features: [
+ "default",
+ "std",
+ ],
rustlibs: [
"libciborium",
"libciborium_io",
diff --git a/cargo2android.json b/cargo2android.json
index 3557c01..d1f88a1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,6 +6,7 @@
"tests": true,
"variants": [
{
+ "features": "default,std"
},
{
"alloc": true,