diff options
| author | Per Larsen <perlarsen@google.com> | 2023-11-09 00:42:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 00:42:58 +0000 |
| commit | 934b39f30051d1ee7777bf4de16aa5ae37701221 (patch) | |
| tree | fcd4c7e546f6763cbfd56a79a6cd3b7c3640ae3e | |
| parent | 3a635e6ccc5db33a1a50935a1b902d2ced237fad (diff) | |
| parent | bd755dd2fde40c94070ad73efffd40b246979551 (diff) | |
| download | serde-934b39f30051d1ee7777bf4de16aa5ae37701221.tar.gz | |
Adding autogenerated Trusty makefile rules am: bd755dd2fd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2750898
Change-Id: I418280eb011177a093a5d91aac6f3040da4996b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |