From 6e3f4751219abfa797c98bf387c4e312856c1def Mon Sep 17 00:00:00 2001 From: Nehemiah Date: Fri, 6 Oct 2023 16:16:54 -0400 Subject: [PATCH] Try again --- cat/cat_s22/BoardConfig.mk | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk index 3273d22..5a04e2c 100644 --- a/cat/cat_s22/BoardConfig.mk +++ b/cat/cat_s22/BoardConfig.mk @@ -1,19 +1,26 @@ +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 -TARGET_NO_KERNEL := true +# TODO(b/111434759, b/111287060) SoC specific hacks +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware + +# 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 + +TARGET_ENABLE_MEDIADRM_64 := + +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 - -# Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect GSI -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 - -# Disable 64 bit mediadrmserver -TARGET_ENABLE_MEDIADRM_64 :=