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

Commit 813249bf authored by bohu's avatar bohu
Browse files

emulator: squash misc modifications from oc-emu-dev 

Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
parent 49415ab9

core/Makefile

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

        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \

        $(INSTALLED_RAMDISK_TARGET) \

        $(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET)

		$(INSTALLED_VENDORIMAGE_TARGET)





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

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

core/tasks/sdk-addon.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,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):$(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_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 \
@@ -117,6 +118,7 @@ $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon 
$(full_target_img): $(full_target) $(addon_img_source_prop) | $(SOONG_ZIP)

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

	@echo Packaging SDK Addon System-Image: $@

	@echo Packaging SDK Addon System-Image: $@

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

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

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

	$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)

	$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)

target/board/generic/BoardConfig.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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





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

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

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic/device.mk

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




PRODUCT_PROPERTY_OVERRIDES := \

PRODUCT_PROPERTY_OVERRIDES := \

    ro.ril.hsxpa=1 \

    ro.ril.hsxpa=1 \

    ro.ril.gprsclass=10 \

    ro.ril.gprsclass=10

    ro.adb.qemud=1





PRODUCT_COPY_FILES := \

PRODUCT_COPY_FILES := \

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

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

target/board/generic_arm64/BoardConfig.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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





BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

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