From 439d11dd0196c003ac2cc074bd36013c38b289bf Mon Sep 17 00:00:00 2001 From: Kwang-un Jin Date: Thu, 10 Oct 2024 14:04:40 +0900 Subject: [PATCH] Move $(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk to the end This is to redefine all the variables in the mk file, not just TARGET_SCREEN_DENSITY. Test: adb shell wm density Flag: EXEMPT Bug fix Bug: 369953823 Change-Id: I05733586e9e5ee1ee8769fde16b0032bdc2fd015 --- tangorpro/BoardConfig.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index 382f609..ed72829 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -25,13 +25,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 - -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk -else - TARGET_SCREEN_DENSITY := 320 -endif - +TARGET_SCREEN_DENSITY := 320 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_TANGORPRO := true BOARD_KERNEL_CMDLINE += swiotlb=noforce @@ -42,3 +36,7 @@ include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/tangorpro/proprietary/BoardConfigVendor.mk include device/google/tangorpro-sepolicy/tangorpro-sepolicy.mk include device/google/tangorpro/wifi/BoardConfig-wifi.mk + +ifdef PHONE_CAR_BOARD_PRODUCT + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +endif