diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-09 18:05:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-09 18:05:38 -0700 |
| commit | 3ebc52eb710c75a1ef51dca7c767701bab74a9ee (patch) | |
| tree | 7396c54a0536c88326b6644b1e1750e504a8777c /rootdir | |
| parent | 24e78ecfb93bceea39c2d58af5eae2aa6467d395 (diff) | |
| parent | 2f21659d4565afd65da1be07c28317a3cb4287a1 (diff) | |
| download | system_core-3ebc52eb710c75a1ef51dca7c767701bab74a9ee.tar.gz system_core-3ebc52eb710c75a1ef51dca7c767701bab74a9ee.tar.bz2 system_core-3ebc52eb710c75a1ef51dca7c767701bab74a9ee.zip | |
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.
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 779f2a9c..e28dd30d 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)/, \ |