summaryrefslogtreecommitdiffstats
path: root/rootdir/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'rootdir/Android.mk')
-rw-r--r--rootdir/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 756005b30..7ff1a74a1 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -7,8 +7,7 @@ copy_from := \
etc/mountd.conf \
etc/dbus.conf \
etc/init.goldfish.sh \
- etc/hosts \
- etc/hcid.conf
+ etc/hosts
dont_copy := \
etc/init.gprs-pppd \
@@ -28,10 +27,13 @@ ALL_PREBUILT += $(copy_to)
# files that live under /...
+# Only copy init.rc if the target doesn't have its own.
+ifneq ($(TARGET_PROVIDES_INIT_RC),true)
file := $(TARGET_ROOT_OUT)/init.rc
$(file) : $(LOCAL_PATH)/init.rc | $(ACP)
$(transform-prebuilt-to-target)
ALL_PREBUILT += $(file)
+endif
file := $(TARGET_ROOT_OUT)/init.goldfish.rc
$(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP)