diff options
| author | Per Larsen <perlarsen@google.com> | 2024-01-24 05:45:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-24 05:45:12 +0000 |
| commit | 0278168e45e786802dd9ec025a8bc99e543c034f (patch) | |
| tree | 9efe801cd726162e71095e062f951cc827982372 | |
| parent | 32e24cd670d15e0981e958e4d5a9639251f62769 (diff) | |
| parent | 521eeefe61f572eb77af1e183a5d7efce45ca1cb (diff) | |
| download | zerocopy-0278168e45e786802dd9ec025a8bc99e543c034f.tar.gz | |
Fix generation of Trusty makefile rules am: 521eeefe61
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zerocopy/+/2908279
Change-Id: I3e3d8fed7573d9f7c97e6f23b15daf5d3bc04081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |