diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-03-19 18:14:53 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-24 16:13:56 -0700 |
| commit | 0f5bb3af4b3a14421885125ce4f9fba328b9bdd8 (patch) | |
| tree | 52e4fab12048e69ffb8094a061ae3b79afc5fe96 | |
| parent | 3ae4af10680f7e4028905210f246b8de7c7d1a01 (diff) | |
| download | build-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
| -rw-r--r-- | core/Makefile | 16 | ||||
| -rw-r--r-- | target/board/generic/BoardConfig.mk | 3 | ||||
| -rw-r--r-- | target/board/generic/recovery.fstab | 7 |
3 files changed, 22 insertions, 4 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 diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 7a25f30..415bdc6 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -5,7 +5,7 @@ # The generic product target doesn't have any hardware-specific pieces. TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +TARGET_NO_KERNEL := false TARGET_ARCH := arm # Note: we build the platform images for ARMv7-A _without_ NEON. @@ -40,6 +40,7 @@ endif # Build OpenGLES emulation guest and host libraries BUILD_EMULATOR_OPENGL := true +BUILD_EMULATOR_OPENGL_DRIVER := true # Build and enable the OpenGL ES View renderer. When running on the emulator, # the GLES renderer disables itself if host GL acceleration isn't available. diff --git a/target/board/generic/recovery.fstab b/target/board/generic/recovery.fstab new file mode 100644 index 0000000..5205901 --- /dev/null +++ b/target/board/generic/recovery.fstab @@ -0,0 +1,7 @@ +# mount point fstype device + +/system yaffs2 system +/cache yaffs2 cache +/data yaffs2 userdata +/sdcard vfat /dev/block/mmcblk0 + |