Fix -Wunused-variable compiler warning am: 2868fcfab8
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2861965
Change-Id: Ib251f67a77d66bd076ef00d9aeafb71d42a987ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index 00aac04..3e3828d 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -21,6 +21,9 @@
LOCAL_DEVICE_FCM_MANIFEST_FILE ?= device/google/trout/manifest.xml
+# Disable shared system image checking
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false
+
ifeq ($(TARGET_USES_CUTTLEFISH_AUDIO),false)
# Car Emulator Audio HAL
LOCAL_AUDIO_PRODUCT_PACKAGE ?= \
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_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
