aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluca020400 <luca.stefani.ge1@gmail.com>2016-05-08 18:33:20 +0200
committerLuca Stefani <luca.stefani.ge1@gmail.com>2016-08-25 14:58:00 +0200
commitc2911d0f5efd4cfdf7939dc899116aa783221559 (patch)
tree4856bfd7cb582f131da7a8e45a319d8a5f0f324a
parentb6b3db7812180de1fa47d3def13cbd71d7f2f3b5 (diff)
downloadandroid_external_nano-cm-14.1_old.tar.gz
android_external_nano-cm-14.1_old.tar.bz2
android_external_nano-cm-14.1_old.zip
ninja-build: nano: don't use $(shell)cm-14.1_oldcm-14.0
Change-Id: Ia10eb0e3d1df9390d9b666c0ef013356ae0ed7aa
-rw-r--r--Android.mk5
1 files 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)