From 3d305710789db2f91360a329291b19d75e4fb4b6 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Tue, 4 May 2021 11:41:39 -0700 Subject: [PATCH 1/2] Support automotive builds. Bug: 187195661 Bug: 205158078 Test: build aosp_raven_car-userdebug and flash R4 Change-Id: I20decb81c3a7993ce75f807e26c2bc903d333340 Merged-In: I20decb81c3a7993ce75f807e26c2bc903d333340 --- raven/BoardConfig.mk | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 6d752a4..c3f2cc7 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -13,11 +13,16 @@ # 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 := raven -TARGET_SCREEN_DENSITY := 560 -USES_DEVICE_GOOGLE_RAVIOLE := true -include device/google/gs101/BoardConfig-common.mk --include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk --include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk +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 := raven + TARGET_SCREEN_DENSITY := 560 + USES_DEVICE_GOOGLE_RAVIOLE := true + + include device/google/gs101/BoardConfig-common.mk + -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk + -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk +endif From 59a71ba97248ef8a3dada3a5d8ac532417466ba2 Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Thu, 4 Nov 2021 15:33:54 -0700 Subject: [PATCH 2/2] Support Oriole for automotive builds bug: 205158078 Test: Local build and test aosp_oriole_car Change-Id: I31fd5e2e6bf262f72ffc086cebdefdbd1f76b6ed --- oriole/BoardConfig.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) 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