raviole: Change the BoardConfig layout
New structure will make sure all future changes to BoardConfig
will be applicable to AAOS on phone builds.
bug: 227488008
Test: Local build and wifi works on raven and oriole car builds
Change-Id: I928a2fb5cfc876427c382d06d798e684e0691ce9
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index bb2f24f..b78d5b4 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -17,14 +17,15 @@
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
TARGET_SCREEN_DENSITY := 560
- USES_DEVICE_GOOGLE_RAVIOLE := true
- BOARD_KERNEL_CMDLINE += disable_dma32=on
-
- include device/google/gs101/BoardConfig-common.mk
- include device/google/gs101/wifi/BoardConfig-wifi.mk
- -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
- -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
endif
+
+TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
+TARGET_BOOTLOADER_BOARD_NAME := raven
+USES_DEVICE_GOOGLE_RAVIOLE := true
+BOARD_KERNEL_CMDLINE += disable_dma32=on
+
+include device/google/gs101/BoardConfig-common.mk
+include device/google/gs101/wifi/BoardConfig-wifi.mk
+-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk