diff options
| author | Andrei Homescu <ahomescu@google.com> | 2024-02-23 00:53:36 +0000 |
|---|---|---|
| committer | Andrei Homescu <ahomescu@google.com> | 2024-02-23 03:39:01 +0000 |
| commit | 8be311906851d78a9c645eddade78d133dfd1030 (patch) | |
| tree | 55aa3bed69f21679c1182b392ddf11fb51d9df3a | |
| parent | e69564d8104e0a1a2a4fa8c403173b9b72e27e1d (diff) | |
| download | lib-8be311906851d78a9c645eddade78d133dfd1030.tar.gz | |
make: Use more portable find -L instead of -xtype
The Android toybox copy of find does not support
-xtype so switch to -L -type instead.
Bug: 285203365
Test: Build Trusty
Change-Id: Ib5f62f58db871cc4ce482c785735f4c3de69af5d
| -rw-r--r-- | make/library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/library.mk b/make/library.mk index 9ed0074..44712df 100644 --- a/make/library.mk +++ b/make/library.mk @@ -290,7 +290,7 @@ define copy-headers-rule # Some libraries include symlinked headers. For now, follow # those symlinks and copy their targets instead so SDK users # can still include the symlink sources. -HEADERS := $$(shell cd "$(1)" 2>/dev/null && find . -xtype f) +HEADERS := $$(shell cd "$(1)" 2>/dev/null && find -L . -type f) OUTPUT_HEADERS := $$(filter-out $$(MODULE_EXPORT_SDK_HEADERS),$$(addprefix $(TRUSTY_SDK_INCLUDE_DIR)/$(MODULE_SDK_HEADER_INSTALL_DIR)/,$$(HEADERS))) MODULE_EXPORT_SDK_HEADERS += $$(OUTPUT_HEADERS) $$(OUTPUT_HEADERS): $(TRUSTY_SDK_INCLUDE_DIR)/$(MODULE_SDK_HEADER_INSTALL_DIR)/% : $(1)/% $(MODULE_SRCDEPS) @@ -664,4 +664,4 @@ MODULE_EXPORT_SDK_HEADERS := MODULE_EXPORT_SRCDEPS := MODULE_UNIQUE_LIBRARY_DEPS := -endif # QUERY_MODULE (this line should stay after all other processing)
\ No newline at end of file +endif # QUERY_MODULE (this line should stay after all other processing) |