From af77342914253f18b70b5dde65de5d76d84c6793 Mon Sep 17 00:00:00 2001 From: Nehemiah Date: Mon, 9 Oct 2023 14:19:11 -0400 Subject: [PATCH] Try again --- cat/cat_s22/BoardConfig.mk | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk index 95f58f8..c9eeb10 100644 --- a/cat/cat_s22/BoardConfig.mk +++ b/cat/cat_s22/BoardConfig.mk @@ -1,10 +1,20 @@ -include build/make/target/board/BoardConfigGsiCommon.mk +include build/make/target/board/generic_arm_ab/BoardConfig.mk +#include device/phh/treble/board-base.mk -TARGET_ARCH := arm -TARGET_ARCH_VARIANT := armv7-a-neon -TARGET_CPU_VARIANT := generic -TARGET_CPU_ABI := armeabi-v7a -TARGET_CPU_ABI2 := armeabi +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000 +endif + +TARGET_USES_64_BIT_BINDER := true +BOARD_SYSTEMIMAGE_AS_SYSTEM := true + +#include build/make/target/board/BoardConfigGsiCommon.mk + +#TARGET_ARCH := arm +#TARGET_ARCH_VARIANT := armv7-a-neon +#TARGET_CPU_VARIANT := generic +#TARGET_CPU_ABI := armeabi-v7a +#TARGET_CPU_ABI2 := armeabi # TODO(b/111434759, b/111287060) SoC specific hacks #BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp @@ -13,14 +23,14 @@ TARGET_CPU_ABI2 := armeabi # TODO(b/36764215): remove this setting when the generic system image # no longer has QCOM-specific directories under /. -BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy +#BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy -TARGET_ENABLE_MEDIADRM_64 := +#TARGET_ENABLE_MEDIADRM_64 := -TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP) +#TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP) -ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 -else -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432 -endif +#ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) +#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 +#else +#BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432 +#endif