From d48fc0b7db72f3beee8a9ffde4408c586dfb47ee Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 15 Nov 2021 14:58:00 -0800 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: Ic7563540a70670f42d73f6466860fadf7883fb86 --- oriole/BoardConfig.mk | 4 ++-- raven/BoardConfig.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index e1ef669..5a05c40 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # 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 := oriole 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