From 97a866299cd6203f424d7c550c444a75dfa98e67 Mon Sep 17 00:00:00 2001 From: MarijnS95 Date: Mon, 9 Sep 2019 21:05:55 +0200 Subject: Fix copy rule correctness (requirement for Android 10). Signed-off-by: MarijnS95 Change-Id: Ia2aca734ffdb61fd4237231f2cc60400a4cf9145 --- Android.mk | 10 +++++----- 1 file 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) -- cgit v1.2.3