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

Commit dfbff3a4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into... 

Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev am: 2cde7868

Change-Id: Ib6c1a7a365012cf5f1ba96c40a2ebb869f08accb
parents bcd45cf3 2cde7868

target/board/BoardConfigEmuCommon.mk

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
  # emulator needs super.img

  BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true



  BOARD_EXT4_SHARE_DUP_BLOCKS := true



  # 3G + header

  BOARD_SUPER_PARTITION_SIZE := 3229614080

  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions

target/board/BoardConfigMainlineCommon.mk

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
TARGET_NO_BOOTLOADER := true

TARGET_NO_RECOVERY := true



BOARD_EXT4_SHARE_DUP_BLOCKS := true



TARGET_USERIMAGES_USE_EXT4 := true



# Mainline devices must have /system_ext, /vendor and /product partitions.

target/board/generic_arm64/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ endif 


include build/make/target/board/BoardConfigGsiCommon.mk



BOARD_EXT4_SHARE_DUP_BLOCKS := true



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := true

BOARD_USES_RECOVERY_AS_BOOT := true