diff options
| author | Per Larsen <perlarsen@google.com> | 2024-01-12 11:55:44 +0000 |
|---|---|---|
| committer | Per Larsen <perlarsen@google.com> | 2024-01-12 11:59:04 +0000 |
| commit | 521eeefe61f572eb77af1e183a5d7efce45ca1cb (patch) | |
| tree | 9efe801cd726162e71095e062f951cc827982372 | |
| parent | 228d67a3e22eb5b3abce08d7e7b65bcba84ac440 (diff) | |
| download | zerocopy-521eeefe61f572eb77af1e183a5d7efce45ca1cb.tar.gz | |
Fix generation of Trusty makefile rules
Thanks to improvements in cargo2rulesmk.py, the patch file is no
longer necessary and no longer applies correctly.
Bug: None
Change-Id: Ia905427cc510ba1da25a98b7d1e1ae4d6aca4704
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | rules.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json index d14b910..f305cd2 100644 --- a/cargo2rulesmk.json +++ b/cargo2rulesmk.json @@ -1,4 +1,3 @@ { - "features": "default,derive", - "patch": "patches/rules.mk.diff" + "features": "default,derive" } @@ -8,13 +8,14 @@ MODULE_SRCS := \ $(LOCAL_DIR)/src/lib.rs \ MODULE_RUST_EDITION := 2018 -# TODO(b/316076550): Remove rules.mk patch when cargo2rulesmk.py is fixed MODULE_RUSTFLAGS += \ + --cfg 'feature="byteorder"' \ --cfg 'feature="default"' \ --cfg 'feature="derive"' \ --cfg 'feature="zerocopy-derive"' \ MODULE_LIBRARY_DEPS := \ + external/rust/crates/byteorder \ external/rust/crates/zerocopy-derive \ include make/library.mk |