From 6bbc22597e4ebf61b82ce653ec27fead0a741b3a Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 2 Aug 2021 19:36:32 -0700 Subject: [PATCH] Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT The statement ``` include $(PHONE_CAR_BOARD_CONFIG) ``` is difficult to translate to the Starlark configuration file. Fortunately, all the potential values of this variable have have similar structure, so ``` PHONE_CAR_BOARD_CONFIG := device/google_car/foo/BoardConfig.mk .... include $(PHONE_CARD_BOARD_CONFIG) ``` can be changed to ``` PHONE_CAR_BOARD_PRODUCT := foo .... include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk ``` Bug: 190051051 Test: treehugger Change-Id: I3b6e8e1aabfb373ab84c756c109b04893d2e8481 --- raven/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index c3f2cc7..4ff656e 100644 --- a/raven/BoardConfig.mk +++ b/raven/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_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := raven