diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-09 21:02:10 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-09 21:02:10 -0400 |
| commit | 2f21659d4565afd65da1be07c28317a3cb4287a1 (patch) | |
| tree | abfcb8ff75c4c6cb31b4272cd272100e2b02c588 /rootdir/Android.mk | |
| parent | 0e1f612d5d5caca3f8c8d7f1689a96148a24afd2 (diff) | |
| parent | ca8177d81443bb93b522c1ab7ff11c0bbc2e0014 (diff) | |
| download | system_core-2f21659d4565afd65da1be07c28317a3cb4287a1.tar.gz system_core-2f21659d4565afd65da1be07c28317a3cb4287a1.tar.bz2 system_core-2f21659d4565afd65da1be07c28317a3cb4287a1.zip | |
Merge change 24213 into eclair
* changes:
Fix a bug that prevented the "generic" product builds from working in the emulator.
Diffstat (limited to 'rootdir/Android.mk')
| -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)/, \ |