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

Commit e6e2566f authored by Bo Hu's avatar Bo Hu Committed by android-build-merger
Browse files

Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am:... 

Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e am: abd33cdb am: 1b86b758
am: d80d9220

Change-Id: I7bc9ad244fe32d494a1719338711579ce2aafc4b
parents b43bbf51 d80d9220

core/Makefile

+21 −0
Original line number Diff line number Diff line
@@ -2740,6 +2740,26 @@ endif # TARGET_BUILD_APPS 
.PHONY: dalvikfiles

dalvikfiles: $(INTERNAL_DALVIK_MODULES)



ifeq ($(BUILD_QEMU_IMAGES),true)

INSTALLED_QEMU_SYSTEMIMAGE := $(PRODUCT_OUT)/system-qemu.img

MK_QEMU_IMAGE_SH := device/generic/goldfish/tools/mk_qemu_image.sh

SGDISK_HOST := $(HOST_OUT_EXECUTABLES)/sgdisk

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

	@echo Create system-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/system.img)



systemimage: $(INSTALLED_QEMU_SYSTEMIMAGE)

droidcore: $(INSTALLED_QEMU_SYSTEMIMAGE)

ifeq ($(BOARD_USES_VENDORIMAGE),true)

INSTALLED_QEMU_VENDORIMAGE := $(PRODUCT_OUT)/vendor-qemu.img

$(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

	@echo Create vendor-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/vendor.img)



vendorimage: $(INSTALLED_QEMU_VENDORIMAGE)

droidcore: $(INSTALLED_QEMU_VENDORIMAGE)

endif

endif

# -----------------------------------------------------------------

# The emulator package

ifeq ($(BUILD_EMULATOR),true)
@@ -2835,6 +2855,7 @@ deps := \ 
	$(SYMBOLS_ZIP) \

	$(COVERAGE_ZIP) \

	$(INSTALLED_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_USERDATAIMAGE_TARGET) \

	$(INSTALLED_RAMDISK_TARGET) \

	$(INSTALLED_SDK_BUILD_PROP_TARGET) \

core/tasks/sdk-addon.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ endif 


# Files copied in the system-image directory

files_to_copy += \

	$(addon_dir_img):$(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \

	$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \

	$(addon_dir_img):$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \

	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

target/board/generic/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 


# Build OpenGLES emulation guest and host libraries

BUILD_EMULATOR_OPENGL := true

BUILD_QEMU_IMAGES := 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_arm64/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 


# Build OpenGLES emulation host and guest libraries

BUILD_EMULATOR_OPENGL := true

BUILD_QEMU_IMAGES := 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_mips/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 


# Build OpenGLES emulation guest and host libraries

BUILD_EMULATOR_OPENGL := true

BUILD_QEMU_IMAGES := 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.