From 521eeefe61f572eb77af1e183a5d7efce45ca1cb Mon Sep 17 00:00:00 2001
From: Per Larsen <perlarsen@google.com>
Date: Fri, 12 Jan 2024 11:55:44 +0000
Subject: 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
---
 cargo2rulesmk.json | 3 +--
 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"
 }
diff --git a/rules.mk b/rules.mk
index 9e71d6d..e35717a 100644
--- a/rules.mk
+++ b/rules.mk
@@ -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
-- 
cgit v1.2.3