diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-23 11:43:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 11:43:23 -0700 |
| commit | 6b4e9ebc4cab1dab3b8769a27868addd202a29b5 (patch) | |
| tree | 55d5ebd0e7ab99a7f0c0a4d1f153e8dcfa6e8506 /rootdir | |
| parent | 9aaa76a7af547a34251c4eb480a4aa3d7485b56d (diff) | |
| parent | a0c98ef01a4c5a859fdde35fed7977b1eb919007 (diff) | |
| download | system_core-6b4e9ebc4cab1dab3b8769a27868addd202a29b5.tar.gz system_core-6b4e9ebc4cab1dab3b8769a27868addd202a29b5.tar.bz2 system_core-6b4e9ebc4cab1dab3b8769a27868addd202a29b5.zip | |
am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.
Merge commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007' into eclair-plus-aosp
* commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007':
Ensure -user builds can run the dex preopt pass in the emulator.
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e28dd30d..3bb22621 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -11,10 +11,13 @@ ifeq ($(TARGET_PRODUCT),generic) copy_from += etc/vold.conf endif -# for non -user build, also copy emulator-support script into /system/etc -ifneq ($(TARGET_BUILD_VARIANT),user) +# the /system/etc/init.goldfish.sh is needed to enable emulator support +# 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 -endif copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from)) @@ -36,13 +39,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) +# Just like /system/etc/init.goldfish.sh, the /init.godlfish.rc is here +# to allow -user builds to properly run the dex pre-optimization pass in +# the emulator. 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)/, \ |