aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Radomski <dextero@google.com>2024-03-11 16:31:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-11 16:31:26 +0000
commit74fa66b0f3175270ea03453c160fe06a26b4998d (patch)
treee1241217bc6a7d233e0590bb2000ec9664a89dba
parentd38c9fdaed2eb50a5266a644cdac19cd2fe23f61 (diff)
parentd94cdb78a3d777fe8ed129b8ae8be506c21c4995 (diff)
downloadbytemuck-74fa66b0f3175270ea03453c160fe06a26b4998d.tar.gz
Merge "bytemuck crate: enable extern_crate_alloc feature" into main
-rw-r--r--Android.bp8
-rw-r--r--cargo_embargo.json3
2 files changed, 10 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 7943b6d..23f1d95 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -38,6 +39,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -59,6 +61,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -80,6 +83,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -101,6 +105,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -122,6 +127,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -143,6 +149,7 @@ rust_test {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
rustlibs: ["libbytemuck"],
proc_macros: ["libbytemuck_derive"],
@@ -159,6 +166,7 @@ rust_library {
features: [
"bytemuck_derive",
"derive",
+ "extern_crate_alloc",
],
proc_macros: ["libbytemuck_derive"],
apex_available: [
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 1453a5e..49c7777 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,6 +1,7 @@
{
"features": [
- "derive"
+ "derive",
+ "extern_crate_alloc"
],
"tests": true
}