diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 21:53:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 21:53:14 +0000 |
| commit | 5724cffc9f9b708f0b0d22bdbc4fa6b8a9871c1d (patch) | |
| tree | ed087884d1072db14b9c9dee7c65b5d822098405 | |
| parent | f32ef21232af19d248e42434a291d8d57a872c66 (diff) | |
| parent | 9b4f40c434e1295c0630baa7d301312acce63eb4 (diff) | |
| download | trout-5724cffc9f9b708f0b0d22bdbc4fa6b8a9871c1d.tar.gz | |
Snap for 10843824 from 9b4f40c434e1295c0630baa7d301312acce63eb4 to 24Q1-release
Change-Id: I97dbc85b4d34a10cf1807b99649c0960f1804c71
| -rw-r--r-- | shared/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | trout_arm64/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | trout_x86_64/BoardConfig.mk | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index 31af81a..61b5293 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -18,4 +18,3 @@ -include device/google/cuttlefish/shared/camera/BoardConfig.mk -include device/google/cuttlefish/shared/graphics/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk --include device/google/cuttlefish/shared/virgl/BoardConfig.mk diff --git a/trout_arm64/BoardConfig.mk b/trout_arm64/BoardConfig.mk index 452d678..edec3c7 100644 --- a/trout_arm64/BoardConfig.mk +++ b/trout_arm64/BoardConfig.mk @@ -26,7 +26,7 @@ ifndef TARGET_BOOTLOADER_BOARD_NAME TARGET_BOOTLOADER_BOARD_NAME := trout endif -BOARD_BOOT_HEADER_VERSION := 3 +BOARD_BOOT_HEADER_VERSION := 4 # Kernel - prefer version 5.10 by default for trout TARGET_KERNEL_USE ?= 5.10 diff --git a/trout_x86_64/BoardConfig.mk b/trout_x86_64/BoardConfig.mk index 5882fa0..c2b269b 100644 --- a/trout_x86_64/BoardConfig.mk +++ b/trout_x86_64/BoardConfig.mk @@ -37,5 +37,10 @@ TARGET_NATIVE_BRIDGE_2ND_ARCH_VARIANT := armv7-a-neon TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT := generic TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi +# VHAL Fake Server Address +# VMADDR_CID_LOCAL (1) for the fake server in the same VM. +BOARD_KERNEL_CMDLINE += androidboot.vendor.vehiclehal.server.cid=1 +BOARD_KERNEL_CMDLINE += androidboot.vendor.vehiclehal.server.port=9210 + -include device/google/trout/shared/BoardConfig.mk -include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk |