Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de1a797f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binder: rules.mk: Use FIND_CRATE to locate dependencies" into main am:... 

Merge "binder: rules.mk: Use FIND_CRATE to locate dependencies" into main am: 3cd48b65 am: 0bd4147f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3291988



Change-Id: Ie3ed560f54909b2b8160dfa09e5a81d2cb734be8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c759df32 0bd4147f

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

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ MODULE_LIBRARY_DEPS += \ 
	$(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \

	$(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \

	$(LIBBINDER_DIR)/trusty/rust/binder_rpc_server_bindgen \

	external/rust/crates/cfg-if \

	external/rust/crates/foreign-types \

	$(call FIND_CRATE,cfg-if) \

	$(call FIND_CRATE,foreign-types) \

	trusty/user/base/lib/tipc/rust \

	trusty/user/base/lib/trusty-sys \

libs/binder/trusty/rust/rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ MODULE_LIBRARY_DEPS += \ 
	$(LIBBINDER_DIR)/trusty/ndk \

	$(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \

	$(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \

	external/rust/crates/downcast-rs \

	external/rust/crates/libc \

	$(call FIND_CRATE,downcast-rs) \

	$(call FIND_CRATE,libc) \

	trusty/user/base/lib/trusty-sys \



MODULE_RUSTFLAGS += \