summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-03-19 18:14:53 +0530
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-03-24 16:13:56 -0700
commit0f5bb3af4b3a14421885125ce4f9fba328b9bdd8 (patch)
tree52e4fab12048e69ffb8094a061ae3b79afc5fe96 /core
parent3ae4af10680f7e4028905210f246b8de7c7d1a01 (diff)
downloadbuild-0f5bb3af4b3a14421885125ce4f9fba328b9bdd8.zip
build-0f5bb3af4b3a14421885125ce4f9fba328b9bdd8.tar.gz
build-0f5bb3af4b3a14421885125ce4f9fba328b9bdd8.tar.bz2
CM on Emulator [ARM]
* set TARGET_NO_KERNEL to false * Add recovery.fstab * Add goldfish target Change-Id: If5104d6e949706f79c673ae26060870f86e18c62
Diffstat (limited to 'core')
-rw-r--r--core/Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile
index be01706..94b5561 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1482,10 +1482,17 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES)
# -----------------------------------------------------------------
# The emulator package
ifeq ($(BUILD_EMULATOR),true)
+
+INSTALLED_QEMU_KERNEL_TARGET := $(PRODUCT_OUT)/kernel-qemu
+
+$(INSTALLED_QEMU_KERNEL_TARGET): $(INSTALLED_KERNEL_TARGET)
+ $(hide) $(ACP) -fp $(INSTALLED_KERNEL_TARGET) $(INSTALLED_QEMU_KERNEL_TARGET)
+
INTERNAL_EMULATOR_PACKAGE_FILES += \
- $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
- prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
- $(INSTALLED_RAMDISK_TARGET) \
+ $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
+ $(INSTALLED_QEMU_KERNEL_TARGET) \
+ $(INSTALLED_RAMDISK_TARGET) \
+ $(recovery_ramdisk) \
$(INSTALLED_SYSTEMIMAGE) \
$(INSTALLED_USERDATAIMAGE_TARGET)
@@ -1497,6 +1504,9 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES)
@echo -e ${CL_YLW}"Package:"${CL_RST}" $@"
$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
+.PHONY: goldfish
+goldfish: $(INTERNAL_EMULATOR_PACKAGE_TARGET)
+
endif
# -----------------------------------------------------------------
# Old PDK stuffs, retired