commit 2a6a0231dc884377826afdce5487e1b95c140bef
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Jun 13 21:39:55 2022 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Fri Jun 17 01:39:18 2022 +0000
tree 1ede3b098fe96e62f18f250a074f1a1d8ebbb68e
parent 53c015f2c4e6dd742a6ef00d83bcaa3e4700edfd

Allow including car boards from outside google_car

Bug: 224902566
Test: Build raven_car and oriole_car
Change-Id: If8b3da8c545b89093436f5ed6c0b65caf67bb5c2

oriole/BoardConfig.mk

diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 1292d4a..916558c 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -13,8 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ifdef PHONE_CAR_BOARD_PRODUCT
-  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+  #RBC# include_top device/google/auto_tcu
+  #RBC# include_top device/google/pixel_tcu
+  #RBC# include_top device/google_car
+  include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
 else
   TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
   TARGET_BOOTLOADER_BOARD_NAME := oriole

raven/BoardConfig.mk

diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 2b67f76..7e7ba7e 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_PRODUCT
-  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+  #RBC# include_top device/google/auto_tcu
+  #RBC# include_top device/google/pixel_tcu
+  #RBC# include_top device/google_car
+  include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
 else
   TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
   TARGET_BOOTLOADER_BOARD_NAME := raven