Skip to content

Commit

Permalink
ninja-build: don't use $(shell) in other Make constructs [4/4]
Browse files Browse the repository at this point in the history
Change-Id: I74961c5dab346b78a09e82353e858b9d68ecbf33
  • Loading branch information
Saleem Rashid authored and Steve Kondik committed Sep 4, 2016
1 parent 99ace49 commit efb01d5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,11 @@ include $(BUILD_EXECUTABLE)

# Run toybox-instlist and generate the rest of the symlinks
toybox_recovery_links: $(TOYBOX_INSTLIST)
toybox_recovery_links: TOY_LIST=$(shell $(TOYBOX_INSTLIST))
toybox_recovery_links: TOYBOX_BINARY := $(TARGET_RECOVERY_ROOT_OUT)/sbin/toybox
toybox_recovery_links:
@echo -e ${CL_CYN}"Generate Toybox links:"${CL_RST} $(TOY_LIST)
@echo -e ${CL_CYN}"Generate Toybox links:"${CL_RST} $$($(TOYBOX_INSTLIST))
@mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin
$(hide) $(foreach t,$(TOY_LIST),ln -sf toybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
$(hide) $(TOYBOX_INSTLIST) | xargs -I'{}' ln -sf toybox '$(TARGET_RECOVERY_ROOT_OUT)/sbin/{}'

# mkshrc
include $(CLEAR_VARS)
Expand Down

0 comments on commit efb01d5

Please sign in to comment.