aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarijnS95 <marijns95@gmail.com>2019-09-09 21:05:55 +0200
committerLuK1337 <priv.luk@gmail.com>2019-10-09 15:06:09 +0200
commit97a866299cd6203f424d7c550c444a75dfa98e67 (patch)
treefbcc5dfd8f6fde6b0afae2efe9002212d7d5b168
parent021432c2b992edca239030ca552780a5c29d9a8d (diff)
downloadandroid_external_bash-97a866299cd6203f424d7c550c444a75dfa98e67.tar.gz
android_external_bash-97a866299cd6203f424d7c550c444a75dfa98e67.tar.bz2
android_external_bash-97a866299cd6203f424d7c550c444a75dfa98e67.zip
Fix copy rule correctness (requirement for Android 10).
Signed-off-by: MarijnS95 <marijns95@gmail.com> Change-Id: Ia2aca734ffdb61fd4237231f2cc60400a4cf9145
-rw-r--r--Android.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 16ee82e..1a23613 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,12 +66,12 @@ include $(BUILD_EXECUTABLE)
# ========================================================
etc_files := $(wildcard $(LOCAL_PATH)/etc/*)
-BASH_ETC := $(TARGET_OUT)/etc/$(LOCAL_MODULE)/
-BASH_CONFIGS := $(addprefix $(LOCAL_PATH)/etc/,$(notdir $(etc_files)))
-$(BASH_CONFIGS): $(LOCAL_INSTALLED_MODULE)
+BASH_ETC := $(TARGET_OUT)/etc/$(LOCAL_MODULE)
+BASH_CONFIGS := $(addprefix $(BASH_ETC)/,$(notdir $(etc_files)))
+$(BASH_CONFIGS): $(BASH_ETC)/%: $(LOCAL_PATH)/etc/% | $(LOCAL_BUILT_MODULE)
@echo "Install: $@ -> $(BASH_ETC)"
- @mkdir -p $(BASH_ETC)
- $(hide) cp $@ $(BASH_ETC)
+ @mkdir -p $(dir $@)
+ $(hide) cp $< $@
ALL_DEFAULT_INSTALLED_MODULES += $(BASH_CONFIGS)