From ca8177d81443bb93b522c1ab7ff11c0bbc2e0014 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 8 Sep 2009 15:55:36 -0700 Subject: [PATCH] Fix a bug that prevented the "generic" product builds from working in the emulator. 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. --- rootdir/Android.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 779f2a9c8..e28dd30d0 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -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)/, \