diff options
| author | Per Larsen <perlarsen@google.com> | 2024-02-16 03:30:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 03:30:51 +0000 |
| commit | 33706cf4bfa99b811063a0d6764ac18f093d641a (patch) | |
| tree | ac2bbe085f8d6090ddd8e5d7ff42f12794f74ad7 | |
| parent | 87300e04d81069a66a112e149734473ee1156f99 (diff) | |
| parent | 607e7288db964774a6e522aaf29e7c114a9be190 (diff) | |
| download | sample-33706cf4bfa99b811063a0d6764ac18f093d641a.tar.gz | |
Revert^2 "rust: Use autogenerated Trusty makefile rules" am: 607e7288db
Original change: https://android-review.googlesource.com/c/trusty/app/sample/+/2746781
Change-Id: I458a40833481b69aed983f70a11127c9843e29f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | hwwsk/rules.mk | 2 | ||||
| -rw-r--r-- | memref-test/rust/rules.mk | 2 | ||||
| -rw-r--r-- | rust-hello-world/app/rules.mk | 4 | ||||
| -rw-r--r-- | rust-hello-world/rules.mk | 4 | ||||
| -rw-r--r-- | rust_no_std/rules.mk | 2 | ||||
| -rw-r--r-- | skel_rust/rules.mk | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/hwwsk/rules.mk b/hwwsk/rules.mk index b833bdb..b1c3b1a 100644 --- a/hwwsk/rules.mk +++ b/hwwsk/rules.mk @@ -27,7 +27,7 @@ MODULE_CRATE_NAME := hwwsk MODULE_LIBRARY_DEPS += \ trusty/user/base/interface/hwwsk \ trusty/user/base/lib/hwwsk/rust \ - trusty/user/base/lib/log-rust \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/trusty-log \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-std \ diff --git a/memref-test/rust/rules.mk b/memref-test/rust/rules.mk index 0c0281a..91f7c31 100644 --- a/memref-test/rust/rules.mk +++ b/memref-test/rust/rules.mk @@ -24,7 +24,7 @@ MODULE_CRATE_NAME := memref MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/trusty-sys \ trusty/user/base/lib/tipc/rust \ - trusty/user/base/lib/log-rust \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/trusty-std \ MODULE_BINDGEN_SRC_HEADER := $(LOCAL_DIR)/bindings.h diff --git a/rust-hello-world/app/rules.mk b/rust-hello-world/app/rules.mk index 0c5ab51..566377f 100644 --- a/rust-hello-world/app/rules.mk +++ b/rust-hello-world/app/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := hello_world_in_rust_app MODULE_LIBRARY_DEPS += \ - trusty/user/base/lib/libc-rust \ - trusty/user/base/lib/log-rust \ + $(call FIND_CRATE,libc) \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ trusty/user/app/sample/rust-hello-world \ diff --git a/rust-hello-world/rules.mk b/rust-hello-world/rules.mk index d20af16..a012757 100644 --- a/rust-hello-world/rules.mk +++ b/rust-hello-world/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := hello_world_in_rust MODULE_LIBRARY_DEPS += \ - trusty/user/base/lib/libc-rust \ - trusty/user/base/lib/log-rust \ + $(call FIND_CRATE,libc) \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ diff --git a/rust_no_std/rules.mk b/rust_no_std/rules.mk index c5ed362..5e6ab48 100644 --- a/rust_no_std/rules.mk +++ b/rust_no_std/rules.mk @@ -27,7 +27,7 @@ MODULE_CRATE_NAME := no_std MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/dlmalloc \ trusty/user/base/lib/trusty-std \ - trusty/user/base/lib/libc-rust \ + $(call FIND_CRATE,libc) \ MODULE_ADD_IMPLICIT_DEPS := false diff --git a/skel_rust/rules.mk b/skel_rust/rules.mk index 0bb5d00..112759c 100644 --- a/skel_rust/rules.mk +++ b/skel_rust/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := skel MODULE_LIBRARY_DEPS += \ - trusty/user/base/lib/libc-rust \ - trusty/user/base/lib/log-rust \ + $(call FIND_CRATE,libc) \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/system_state/rust \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ |