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

Commit 7b5e1aba authored by bohu's avatar bohu
Browse files

emulator: squash misc modifications from oc-emu-dev 

Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
parent b7e2fabe

core/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2761,8 +2761,7 @@ INTERNAL_EMULATOR_PACKAGE_FILES += \ 
        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \

        $(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET)

		$(INSTALLED_USERDATAIMAGE_TARGET)



name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG)

core/tasks/sdk-addon.mk

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ endif 
# Files copied in the system-image directory

files_to_copy += \

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

	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.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 \
@@ -114,9 +115,10 @@ $(full_target): $(sdk_addon_deps) | $(ACP) 
	$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) )



$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)

$(full_target_img): $(full_target) $(addon_img_source_prop)

$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP)

	@echo Packaging SDK Addon System-Image: $@

	$(hide) mkdir -p $(dir $@)

	$(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data

	$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) )

target/board/generic/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ ifeq ($(HOST_OS),linux) 
endif



TARGET_USES_HWC2 := true

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3



# Build OpenGLES emulation guest and host libraries

BUILD_EMULATOR_OPENGL := true
@@ -60,6 +61,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic/device.mk

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 


PRODUCT_PROPERTY_OVERRIDES := \

    ro.ril.hsxpa=1 \

    ro.ril.gprsclass=10 \

    ro.adb.qemud=1

    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

target/board/generic_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ ifeq ($(HOST_OS),linux) 
endif



TARGET_USES_HWC2 := true

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3



# Build OpenGLES emulation host and guest libraries

BUILD_EMULATOR_OPENGL := true
@@ -91,6 +92,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy