Revert^2 "rust: Use autogenerated Trusty makefile rules" am: ac9e6f78ed
Original change: https://android-review.googlesource.com/c/trusty/app/keymint/+/2746780
Change-Id: I919f89b19f0a4358e222b4b5dd951274ce09b630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 \
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 \
