Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7
am: dbbd3311ae
am: fe3b305516
am: 69121fd68c
Change-Id: Ic31e0551981bc9ee48586a1c2222817610d4500a
This commit is contained in:
commit
34e0ca1577
8 changed files with 30 additions and 1 deletions
|
@ -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)
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -66,6 +66,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.
|
||||
|
|
|
@ -31,6 +31,10 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
|
|||
# Build OpenGLES emulation host and guest libraries
|
||||
BUILD_EMULATOR_OPENGL := true
|
||||
|
||||
# Build partitioned system.img and vendor.img (if applicable)
|
||||
# for qemu, otherwise, init cannot find PART_NAME
|
||||
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.
|
||||
USE_OPENGL_RENDERER := true
|
||||
|
|
|
@ -36,6 +36,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.
|
||||
|
|
Loading…
Reference in a new issue