system/core
| Revision | 8f959862bcec166d5667851cd50fbf5b72b54e19 (tree) |
|---|---|
| Time | 2011-08-04 17:31:46 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
do not include goldfish files on x86
rootdir/Android.mk (diff)| @@ -17,7 +17,9 @@ endif | ||
| 17 | 17 | # to run the dex pre-optimization *in* the emulator. So keep the file until |
| 18 | 18 | # we are capable of running dex preopt on the host. |
| 19 | 19 | # |
| 20 | +ifneq ($(TARGET_ARCH),x86) | |
| 20 | 21 | copy_from += etc/init.goldfish.sh |
| 22 | +endif | |
| 21 | 23 | |
| 22 | 24 | copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) |
| 23 | 25 | copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from)) |
| @@ -49,6 +51,7 @@ $(INSTALLED_RAMDISK_TARGET): $(file) | ||
| 49 | 51 | # Just like /system/etc/init.goldfish.sh, the /init.godlfish.rc is here |
| 50 | 52 | # to allow -user builds to properly run the dex pre-optimization pass in |
| 51 | 53 | # the emulator. |
| 54 | +ifneq ($(TARGET_ARCH),x86) | |
| 52 | 55 | file := $(TARGET_ROOT_OUT)/init.goldfish.rc |
| 53 | 56 | $(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP) |
| 54 | 57 | $(transform-prebuilt-to-target) |
| @@ -60,6 +63,7 @@ $(file) : $(LOCAL_PATH)/etc/ueventd.goldfish.rc | $(ACP) | ||
| 60 | 63 | $(transform-prebuilt-to-target) |
| 61 | 64 | ALL_PREBUILT += $(file) |
| 62 | 65 | $(INSTALLED_RAMDISK_TARGET): $(file) |
| 66 | +endif | |
| 63 | 67 | |
| 64 | 68 | # create some directories (some are mount points) |
| 65 | 69 | DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \ |
Fork