tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 471e2ba1d6

Change-Id: I89357469dfcb50f03771e733a41ea704801ce044
This commit is contained in:
Bo Hu 2017-08-01 07:07:07 +00:00 committed by android-build-merger
commit b0ca7302aa
8 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/Makefile
View file

@ -2740,26 +2740,6 @@ endif # TARGET_BUILD_APPS
.PHONY: dalvikfiles .PHONY: dalvikfiles
dalvikfiles: $(INTERNAL_DALVIK_MODULES) 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 # The emulator package
ifeq ($(BUILD_EMULATOR),true) ifeq ($(BUILD_EMULATOR),true)

2
core/tasks/sdk-addon.mk
View file

@ -63,7 +63,7 @@ endif
# Files copied in the system-image directory # Files copied in the system-image directory
files_to_copy += \ files_to_copy += \
$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \ $(addon_dir_img):$(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
$(addon_dir_img):$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.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):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \ $(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

1
target/board/generic/BoardConfig.mk
View file

@ -43,7 +43,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation guest and host libraries # Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
BUILD_QEMU_IMAGES := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.

1
target/board/generic_arm64/BoardConfig.mk
View file

@ -74,7 +74,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
BUILD_QEMU_IMAGES := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.

1
target/board/generic_mips/BoardConfig.mk
View file

@ -51,7 +51,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation guest and host libraries # Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
BUILD_QEMU_IMAGES := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.

1
target/board/generic_mips64/BoardConfig.mk
View file

@ -66,7 +66,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation guest and host libraries # Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
BUILD_QEMU_IMAGES := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.

4
target/board/generic_x86/BoardConfig.mk
View file

@ -31,10 +31,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true 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, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true USE_OPENGL_RENDERER := true

1
target/board/generic_x86_64/BoardConfig.mk
View file

@ -36,7 +36,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
BUILD_QEMU_IMAGES := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.