aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 13:14:45 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-09 13:14:45 +0000
commit36fefb90a25fc3652642a0a2b1a4a614f0301cf0 (patch)
treeb0c544c71429c5a4d2e61f67bffc4483f9c1e7fa
parent714ce9a723963463eab4e2e289bc0820199b4baf (diff)
downloadcoset-36fefb90a25fc3652642a0a2b1a4a614f0301cf0.tar.gz
Enable std feature in cargo2android.json.
This was enabled in the generated Android.bp without changing cargo2android.json, so the change would be lost the next time cargo2android.py is run. Test: Ran cargo2android.py Change-Id: I74f657b138f4f2900e6eac1b35f502b6905b8c9f
-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,