openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 2f21659d: Merge change 24213 into eclair 

Merge commit '2f21659d4565afd65da1be07c28317a3cb4287a1' into eclair-plus-aosp

* commit '2f21659d4565afd65da1be07c28317a3cb4287a1':
  Fix a bug that prevented the "generic" product builds from working in the emulator.
This commit is contained in:
David 'Digit' Turner 2009-09-09 18:05:38 -07:00 committed by Android Git Automerger
parent 24e78ecfb9 2f21659d45
commit 3ebc52eb71
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rootdir/Android.mk
View File

@ -5,11 +5,15 @@ include $(CLEAR_VARS)
copy_from := \
etc/dbus.conf \
etc/init.goldfish.sh \
etc/hosts
ifeq ($(TARGET_PRODUCT),generic)
copy_from := etc/vold.conf
copy_from += etc/vold.conf
endif
# for non -user build, also copy emulator-support script into /system/etc
ifneq ($(TARGET_BUILD_VARIANT),user)
copy_from += etc/init.goldfish.sh
endif
copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
@ -32,11 +36,13 @@ $(file) : $(LOCAL_PATH)/init.rc | $(ACP)
ALL_PREBUILT += $(file)
endif
# for non -user build, also copy emulator-specific init script into /
ifneq ($(TARGET_BUILD_VARIANT),user)
file := $(TARGET_ROOT_OUT)/init.goldfish.rc
$(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP)
$(transform-prebuilt-to-target)
ALL_PREBUILT += $(file)
endif
# create some directories (some are mount points)
DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \