commit 6b470d5af8e322dfba228b87aeb6061cb81a353c
author Sasha Smundak <asmundak@google.com> Tue Dec 07 21:51:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 07 21:51:51 2021 +0000
tree f1662988db9dae5cf7d531b42d7ac1811936792d
parent 4214c74e90ac0aa75d944f7e3f84b6eb37fc6d09
parent 721e015b1854aa66a16bdc5d6bff28fe6066ed08

Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT am: 721e015b18

Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1910271

Change-Id: I722b8adfa0dd5b189b431ad958adfb7439a2f80c

blueline/BoardConfig.mk

diff --git a/blueline/BoardConfig.mk b/blueline/BoardConfig.mk
index b990896..1736bc6 100644
--- a/blueline/BoardConfig.mk
+++ b/blueline/BoardConfig.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_CONFIG
-  include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
   TARGET_BOOTLOADER_BOARD_NAME := blueline
   TARGET_SCREEN_DENSITY := 440

crosshatch/BoardConfig.mk

diff --git a/crosshatch/BoardConfig.mk b/crosshatch/BoardConfig.mk
index 828afd9..de92096 100644
--- a/crosshatch/BoardConfig.mk
+++ b/crosshatch/BoardConfig.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_CONFIG
-  include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
   TARGET_BOOTLOADER_BOARD_NAME := crosshatch
   TARGET_SCREEN_DENSITY := 560