From c2911d0f5efd4cfdf7939dc899116aa783221559 Mon Sep 17 00:00:00 2001 From: luca020400 Date: Sun, 8 May 2016 18:33:20 +0200 Subject: ninja-build: nano: don't use $(shell) Change-Id: Ia10eb0e3d1df9390d9b666c0ef013356ae0ed7aa --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 1b839f2f..baa9d2a2 100644 --- a/Android.mk +++ b/Android.mk @@ -41,11 +41,10 @@ include $(BUILD_EXECUTABLE) # ======================================================== # nano configs # ======================================================== -etc_files := $(shell ls -1 $(LOCAL_PATH)/etc/) +etc_files := $(wildcard $(LOCAL_PATH)/etc/*) NANO_ETC := $(TARGET_OUT)/etc/$(LOCAL_MODULE)/ -NANO_CONFIGS := $(addprefix $(LOCAL_PATH)/etc/,$(etc_files)) -$(NANO_CONFIGS): NANO_BINARY := $(LOCAL_MODULE) +NANO_CONFIGS := $(addprefix $(LOCAL_PATH)/etc/,$(notdir $(etc_files))) $(NANO_CONFIGS): $(LOCAL_INSTALLED_MODULE) @echo "Install: $@ -> $(NANO_ETC)" @mkdir -p $(NANO_ETC) -- cgit v1.2.3