diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-09 02:13:25 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-09 02:13:25 +0000 |
| commit | 8242d117033f4ae8a3e4dcc2c136e1b4d348e2e6 (patch) | |
| tree | fcd4c7e546f6763cbfd56a79a6cd3b7c3640ae3e | |
| parent | 1417dc4ba08c8ad92d834261d9178a00151ae8d8 (diff) | |
| parent | bd755dd2fde40c94070ad73efffd40b246979551 (diff) | |
| download | serde-8242d117033f4ae8a3e4dcc2c136e1b4d348e2e6.tar.gz | |
Snap for 11073167 from bd755dd2fde40c94070ad73efffd40b246979551 to sdk-release
Change-Id: I60d6bebf1f739e0aa8cbcb6d00c414411fe40f75
| -rw-r--r-- | cargo2rulesmk.json | 4 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 13 | ||||
| -rw-r--r-- | rules.mk | 22 |
3 files changed, 39 insertions, 0 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..6610391 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,4 @@ +{ + "features": "default,derive,alloc", + "patch": "patches/rules.mk.diff" +}
\ No newline at end of file diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..34a66ce --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,13 @@ +diff --git a/rules.mk b/rules.mk +index 5e5b3d4..5aeddb1 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -15,4 +15,8 @@ MODULE_RUSTFLAGS += \ + --cfg 'feature="serde_derive"' \ + --cfg 'feature="std"' \ + ++MODULE_LIBRARY_DEPS := \ ++ trusty/user/base/lib/liballoc-rust \ ++ external/rust/crates/serde_derive \ ++ + include make/library.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..5aeddb1 --- /dev/null +++ b/rules.mk @@ -0,0 +1,22 @@ +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features . +# Do not modify this file as changes will be overridden on upgrade. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := serde +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2015 +MODULE_RUSTFLAGS += \ + --cfg 'feature="alloc"' \ + --cfg 'feature="default"' \ + --cfg 'feature="derive"' \ + --cfg 'feature="serde_derive"' \ + --cfg 'feature="std"' \ + +MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/liballoc-rust \ + external/rust/crates/serde_derive \ + +include make/library.mk |