Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f5bb3af authored by Chirayu Desai's avatar Chirayu Desai Committed by Gerrit Code Review
Browse files

CM on Emulator [ARM] 

* set TARGET_NO_KERNEL to false
* Add recovery.fstab
* Add goldfish target

Change-Id: If5104d6e949706f79c673ae26060870f86e18c62
parent 3ae4af10

core/Makefile

+13 −3
Original line number Diff line number Diff line
@@ -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_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

target/board/generic/BoardConfig.mk

+2 −1
Original line number Diff line number Diff line
@@ -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.

target/board/generic/recovery.fstab

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# mount point		fstype		device



/system		yaffs2		system

/cache		yaffs2		cache

/data		yaffs2		userdata

/sdcard		vfat		/dev/block/mmcblk0