From 8cc6b1181ee6acbb05763caf7da0946815dee324 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Fri, 20 Oct 2023 11:56:05 -0700 Subject: [PATCH] Add special paths for BoardConfig.mk for gf and cf goldfish and cuttlefish are emulator and have many boards which makes their device folders very crowded. This change will allow to move all boards into a dedicated folder. This change will go away once a more consistent approach to search for board configurations is implemented. Bug: 295259752 Test: presubmit Change-Id: I78efe5a0ecd1ca9cffbadc7d7112f50e444ff7c3 Signed-off-by: Roman Kiryanov --- core/board_config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/board_config.mk b/core/board_config.mk index eb4c5ecfd1..5e2fcdd13f 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -223,6 +223,8 @@ else board_config_mk := \ $(strip $(sort $(wildcard \ $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \ + device/generic/goldfish/board/$(TARGET_DEVICE)/BoardConfig.mk \ + device/google/cuttlefish/board/$(TARGET_DEVICE)/BoardConfig.mk \ $(shell test -d device && find -L device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ $(shell test -d vendor && find -L vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \ )))