diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:08:08 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:08:08 -0800 |
| commit | 35237d135807af84bf9b0e5b8d7f8633e58db6f5 (patch) | |
| tree | d8bcf3ada2182d248604728285dd80abb466f22a /rootdir/Android.mk | |
| parent | 4f6e8d7a00cbeda1e70cc15be9c4af1018bdad53 (diff) | |
| download | system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.tar.gz system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.tar.bz2 system_core-35237d135807af84bf9b0e5b8d7f8633e58db6f5.zip | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'rootdir/Android.mk')
| -rw-r--r-- | rootdir/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 756005b3..7ff1a74a 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) |