Support Oriole for automotive builds
bug: 205158078
Test: Local build and test aosp_oriole_car
Change-Id: I31fd5e2e6bf262f72ffc086cebdefdbd1f76b6ed
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index d94b836..e1ef669 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -13,11 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
-TARGET_BOOTLOADER_BOARD_NAME := oriole
-TARGET_SCREEN_DENSITY := 420
-USES_DEVICE_GOOGLE_RAVIOLE := true
+ifdef PHONE_CAR_BOARD_CONFIG
+ include $(PHONE_CAR_BOARD_CONFIG)
+else
+ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
+ TARGET_BOOTLOADER_BOARD_NAME := oriole
+ TARGET_SCREEN_DENSITY := 420
+ USES_DEVICE_GOOGLE_RAVIOLE := true
-include device/google/gs101/BoardConfig-common.mk
--include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
--include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+ include device/google/gs101/BoardConfig-common.mk
+ -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+ -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+endif