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

Commit aa44c8d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ie0234187,Iace22e38 am: e0427689 

Original change: https://android-review.googlesource.com/c/platform/build/+/2500963



Change-Id: I9f97ec9e4d2b29e7c6c5438bfdeaacd84e4e3b86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c309f01 e0427689

target/board/BoardConfigEmuCommon.mk

+23 −40
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ USE_OPENGL_RENDERER := true 
# Emulator doesn't support sparse image format.

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true



ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

# emulator is Non-A/B device

AB_OTA_UPDATER := false
@@ -37,7 +36,6 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
BOARD_SUPER_PARTITION_SIZE ?= 8598323200

BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions



  ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)

BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \

  system \

  system_ext \
@@ -48,24 +46,9 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4

TARGET_COPY_OUT_SYSTEM_EXT := system_ext

BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

  else

    TARGET_COPY_OUT_PRODUCT := system/product

    TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext

    BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \

        system \

        vendor

  endif



# 8G

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592

else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

  # Enable dynamic system image size and reserved 64MB in it.

  BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864

  BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 67108864

else

  BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472

  BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640

endif



#vendor boot

BOARD_INCLUDE_DTB_IN_BOOTIMG := false