Skip to content

Commit 0bd4147

Browse files
Treehugger Robotandroid-build-merge-worker-robot
authored andcommitted
Merge "binder: rules.mk: Use FIND_CRATE to locate dependencies" into main am: 3cd48b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3291988 Change-Id: I24cc1ef99dfd0fa08d9969f241eb8a3cf425e682 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents d30ea40 + 3cd48b6 commit 0bd4147

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

libs/binder/trusty/rust/rpcbinder/rules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ MODULE_LIBRARY_DEPS += \
2929
$(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \
3030
$(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \
3131
$(LIBBINDER_DIR)/trusty/rust/binder_rpc_server_bindgen \
32-
external/rust/crates/cfg-if \
33-
external/rust/crates/foreign-types \
32+
$(call FIND_CRATE,cfg-if) \
33+
$(call FIND_CRATE,foreign-types) \
3434
trusty/user/base/lib/tipc/rust \
3535
trusty/user/base/lib/trusty-sys \
3636

libs/binder/trusty/rust/rules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ MODULE_LIBRARY_DEPS += \
2727
$(LIBBINDER_DIR)/trusty/ndk \
2828
$(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \
2929
$(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \
30-
external/rust/crates/downcast-rs \
31-
external/rust/crates/libc \
30+
$(call FIND_CRATE,downcast-rs) \
31+
$(call FIND_CRATE,libc) \
3232
trusty/user/base/lib/trusty-sys \
3333

3434
MODULE_RUSTFLAGS += \

0 commit comments

Comments
 (0)