Merge "Add special paths for BoardConfig.mk for gf and cf" into main

aosp-mirror · Oct 20, 2023 · 9bfce20 · 9bfce20
2 parents 4d136f5 + 8cc6b11
commit 9bfce20
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/board_config.mk b/core/board_config.mk
@@ -224,6 +224,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') \
     )))