aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2011-11-29 21:29:05 -0800
committerSteve Kondik <shade@chemlab.org>2011-11-29 22:50:37 -0800
commita818bf11e8bbee9b53f0c67de7f7441d998305ab (patch)
tree9b6452bd93a4e98aa72fbdaa07ea0590f9329464
parent3fc9de137941ea01501dc11cfec22c16963b5876 (diff)
downloadexternal_bash-a818bf11e8bbee9b53f0c67de7f7441d998305ab.zip
external_bash-a818bf11e8bbee9b53f0c67de7f7441d998305ab.tar.gz
external_bash-a818bf11e8bbee9b53f0c67de7f7441d998305ab.tar.bz2
Remove usage of ALL_PREBUILT
Change-Id: Ie64b10dc325386fbb73c16d984462963161900fc
-rw-r--r--Android.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 97c085c..a639704 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,14 +49,18 @@ include $(BUILD_EXECUTABLE)
# ========================================================
etc_files := $(shell ls -1 $(LOCAL_PATH)/etc/)
-copy_to := $(addprefix $(TARGET_OUT)/etc/$(LOCAL_MODULE)/,$(etc_files))
-copy_from := $(addprefix $(LOCAL_PATH)/etc/,$(etc_files))
+BASH_ETC := $(TARGET_OUT)/etc/$(LOCAL_MODULE)/
+BASH_CONFIGS := $(addprefix $(LOCAL_PATH)/etc/,$(etc_files))
+$(BASH_CONFIGS): BASH_BINARY := $(LOCAL_MODULE)
+$(BASH_CONFIGS): $(LOCAL_INSTALLED_MODULE)
+ @echo "Install: $@ -> $(BASH_ETC)"
+ @mkdir -p $(BASH_ETC)
+ $(hide) cp $@ $(BASH_ETC)
-$(copy_to) : PRIVATE_MODULE := system_etcdir
-$(copy_to) : $(TARGET_OUT)/etc/$(LOCAL_MODULE)/% : $(LOCAL_PATH)/etc/% | $(ACP)
- $(transform-prebuilt-to-target)
+ALL_DEFAULT_INSTALLED_MODULES += $(BASH_CONFIGS)
-ALL_PREBUILT += $(copy_to)
+ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
+ $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(BASH_CONFIGS)
# ========================================================
include $(call all-makefiles-under,$(LOCAL_PATH))