commit f538091dba1b274cabdc818ce4647e0f71d41b7f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 20 21:02:05 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 20 21:02:05 2023 +0000
tree ba7f6227ecc1316ba06fc605c4b2c2e6e4d251c8
parent e12c62446043e4425d65c7b5cbb149fa55a479f3
parent 9bfce20efded293af058094618d94cb098e08c79

Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd

Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I7c21db126682608867a9132f92ad548ec83987fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index a0e5d36..b7ca3a4 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -224,6 +224,8 @@
   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') \
     )))