diff options
| author | Frances Wingerter <wingerter@google.com> | 2024-02-16 05:13:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 05:13:15 +0000 |
| commit | c04e2cf8396fe71d5e6f8df9ad90c89db469e1bb (patch) | |
| tree | af13715111ca4d1695810df9ce8585292b05e282 | |
| parent | 73dff3092633ea411acb58573c6dbeca6bf16775 (diff) | |
| parent | 750734867c192e5d0ca09293ae68dae47a5aceb6 (diff) | |
| download | trusty-c04e2cf8396fe71d5e6f8df9ad90c89db469e1bb.tar.gz | |
build: move GLOBAL_HOST_RUSTFLAGS to kernel build system am: 750734867c
Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/2928630
Change-Id: Ic68cfedbc34a77835bcb1ec584e380e120d6d1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | app/trusty/user-tasks.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/trusty/user-tasks.mk b/app/trusty/user-tasks.mk index 5928935..33238a7 100644 --- a/app/trusty/user-tasks.mk +++ b/app/trusty/user-tasks.mk @@ -89,7 +89,6 @@ TRUSTY_SDK_LIB_DIR := $(TRUSTY_SDK_SYSROOT)/usr/lib TRUSTY_SDK_LICENSE_DIR := $(TRUSTY_SDK_DIR)/licenses TRUSTY_SDK_LICENSE := $(TRUSTY_SDK_DIR)/LICENSE TRUSTY_LIBRARY_BUILDDIR := $(BUILDDIR)/lib -TRUSTY_HOST_LIBRARY_BUILDDIR := $(BUILDDIR)/host_lib # The license file construction assumes that all projects will contain the same # set of SDK modules and thus the same set of respective license files. If this @@ -146,7 +145,6 @@ define TOSDKLIBNAME $(patsubst lib%,%,$(notdir $(1))) endef -GLOBAL_HOST_RUSTFLAGS += -L $(RUST_HOST_LIBDIR) -L dependency=$(TRUSTY_HOST_LIBRARY_BUILDDIR) GLOBAL_USER_RUSTFLAGS += -L dependency=$(TRUSTY_LIBRARY_BUILDDIR) # We need the host library dir to pick up recursive dependencies that are proc |