ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure -user builds can run the dex preopt pass in the emulator.

Browse source 
This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.
This commit is contained in:
David 'Digit' Turner 2009-09-23 11:19:20 -07:00
parent 79aedbee8f
commit a0c98ef01a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rootdir/Android.mk
View file

@ -11,10 +11,13 @@ ifeq ($(TARGET_PRODUCT),generic)
copy_from += etc/vold.conf copy_from += etc/vold.conf
endif endif
# for non -user build, also copy emulator-support script into /system/etc # the /system/etc/init.goldfish.sh is needed to enable emulator support
ifneq ($(TARGET_BUILD_VARIANT),user) # in the system image. In theory, we don't need these for -user builds
# which are device-specific. However, these builds require at the moment
# to run the dex pre-optimization *in* the emulator. So keep the file until
# we are capable of running dex preopt on the host.
#
copy_from += etc/init.goldfish.sh copy_from += etc/init.goldfish.sh
endif
copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from)) copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from))
@ -36,13 +39,13 @@ $(file) : $(LOCAL_PATH)/init.rc | $(ACP)
ALL_PREBUILT += $(file) ALL_PREBUILT += $(file)
endif endif
# for non -user build, also copy emulator-specific init script into / # Just like /system/etc/init.goldfish.sh, the /init.godlfish.rc is here
ifneq ($(TARGET_BUILD_VARIANT),user) # to allow -user builds to properly run the dex pre-optimization pass in
# the emulator.
file := $(TARGET_ROOT_OUT)/init.goldfish.rc file := $(TARGET_ROOT_OUT)/init.goldfish.rc
$(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP) $(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP)
$(transform-prebuilt-to-target) $(transform-prebuilt-to-target)
ALL_PREBUILT += $(file) ALL_PREBUILT += $(file)
endif
# create some directories (some are mount points) # create some directories (some are mount points)
DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \ DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \