aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlice Ryhl <aliceryhl@google.com>2023-10-24 15:18:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-24 15:18:57 +0000
commit3ca01cd6a2bdf285132db66b39623e672544fee7 (patch)
tree20008dc52b60763f5753ad678dcf2805f516ff81
parent0abda3acf0abf97dbd726d44b5e465fe65616a16 (diff)
parent86675ac08c173a68ba0c67002403d80c3f31cf22 (diff)
downloadzerocopy-3ca01cd6a2bdf285132db66b39623e672544fee7.tar.gz
Add simd feature to zerocopy am: 738d78f669 am: 86675ac08c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zerocopy/+/2799614 Change-Id: I093889da8989a0c49580bd9d44a2860cce8a2fd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--BUILD1
-rw-r--r--cargo2android.json6
3 files changed, 7 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 63ead71..f2971e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,6 +29,7 @@ rust_library {
features: [
"byteorder",
"derive",
+ "simd",
"zerocopy-derive",
],
rustlibs: [
@@ -54,6 +55,7 @@ rust_library_rlib {
"alloc",
"byteorder",
"derive",
+ "simd",
"zerocopy-derive",
],
rustlibs: [
@@ -85,6 +87,7 @@ rust_library_rlib {
features: [
"byteorder",
"derive",
+ "simd",
"zerocopy-derive",
],
rustlibs: [
diff --git a/BUILD b/BUILD
index 3f5286c..ea2a7b5 100644
--- a/BUILD
+++ b/BUILD
@@ -35,6 +35,7 @@ rust_library(
crate_features = [
"byteorder",
"derive",
+ "simd",
"zerocopy-derive",
],
edition = "2021",
diff --git a/cargo2android.json b/cargo2android.json
index d665005..68d4eaf 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,7 @@
{
"device": true,
"run": true,
- "features": "derive,byteorder",
+ "features": "derive,byteorder,simd",
"variants": [
{
"tests": false
@@ -9,7 +9,7 @@
{
"alloc": true,
"dependency-suffix": "_nostd",
- "features": "alloc,derive,byteorder",
+ "features": "alloc,derive,byteorder,simd",
"force-rlib": true,
"no-host": true,
"suffix": "_nostd",
@@ -17,7 +17,7 @@
},
{
"dependency-suffix": "_nostd",
- "features": "derive,byteorder",
+ "features": "derive,byteorder,simd",
"force-rlib": true,
"no-host": true,
"suffix": "_nostd_noalloc",