universal7885: Fixup merge errors

This commit is contained in:
roynatech2544 2021-10-31 20:51:11 +09:00
commit 93778fc639
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
7 changed files with 122 additions and 21 deletions

View file

@ -3,9 +3,6 @@ DEVICE_PATH := device/samsung/a20e
# Asserts
TARGET_OTA_ASSERT_DEVICE := a20e,a20edd
# Keymaster
TARGET_KEYMASTER_VARIANT := samsung
# Kernel
TARGET_KERNEL_CONFIG := exynos7885-a20e_enforcing_defconfig
@ -16,11 +13,5 @@ TARGET_SCREEN_DENSITY := 320
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528 # 55MB
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4320133120 #4.02GB
# Recovery
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/recovery.fstab
# Sepolicy
BOARD_SEPOLICY_TEE_FLAVOR := teegris
# Inherit common board flags
include device/samsung/universal7885-common/BoardConfigCommon.mk