tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a bug that prevented the "generic" product builds from working in the emulator.

Browse source 
This also ensures that emulator-specific files /init.goldfish.rc and
/system/etc/init.goldfish.sh are never part of -user builds, which
correspond to production devices.
This commit is contained in:
David 'Digit' Turner 2009-09-08 15:55:36 -07:00
parent 82a6014d90
commit ca8177d814
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)/, \