commit ac9e6f78ed2a2f1176d9cced6ad5ac832be5b06f
author Per Larsen <perlarsen@google.com> Fri Sep 08 23:12:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 08 23:12:29 2023 +0000
tree 6fcc2bbe1cd61b214b7a1d34e7917775e2a660ae
parent c8c514fec6ad78114c73c02f842ca3e6e479d32c

Revert^2 "rust: Use autogenerated Trusty makefile rules"

c8c514fec6ad78114c73c02f842ca3e6e479d32c

Change-Id: Ib77f7c4dd672337e14cd4d5c40e7275f41d06083

app/rules.mk

diff --git a/app/rules.mk b/app/rules.mk
index 9a3cb34..e74e93a 100644
--- a/app/rules.mk
+++ b/app/rules.mk
@@ -31,9 +31,9 @@
 	trusty/user/base/lib/keymint-rust/common \
 	trusty/user/base/lib/keymint-rust/ta \
 	trusty/user/base/lib/keymint-rust/wire \
-	trusty/user/base/lib/libc-rust \
+	$(call FIND_CRATE,libc) \
 	trusty/user/base/lib/libstd-rust \
-	trusty/user/base/lib/log-rust \
+	$(call FIND_CRATE,log) \
 	trusty/user/base/lib/tipc/rust \
 	trusty/user/base/lib/trusty-log \
 	trusty/user/base/lib/trusty-std \

rules.mk

diff --git a/rules.mk b/rules.mk
index fded814..4f9ac18 100644
--- a/rules.mk
+++ b/rules.mk
@@ -32,8 +32,8 @@
 	trusty/user/base/lib/keymint-rust/boringssl \
 	trusty/user/base/lib/keymint-rust/common \
 	trusty/user/base/lib/keymint-rust/ta \
-	trusty/user/base/lib/log-rust \
-	trusty/user/base/lib/protobuf-rust \
+	$(call FIND_CRATE,log) \
+	$(call FIND_CRATE,protobuf) \
 	trusty/user/base/lib/storage/rust \
 	trusty/user/base/lib/tipc/rust \
 	trusty/user/base/lib/system_state/rust \