summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSihu Song <sihusong@google.com>2023-09-11 09:16:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-11 09:16:30 +0000
commited030abd8ed576efabd282a90481971008c00dde (patch)
tree717a37a2b22b3c695bc6267eaec6de16e73b04bf
parentb899aef55a52ea4327d0c0a1c8ad59c9a849483f (diff)
parentf28b5aa65d5ff395b06ba80687b246d02fe52bc9 (diff)
downloadcar-ed030abd8ed576efabd282a90481971008c00dde.tar.gz
Adding configs that should be common across AAOS emulators am: f28b5aa65d
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/24677150 Change-Id: Ia3b255f95dcea12e4797785ecbfc3d8fbf3b550e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--emulator/car_emulator_vendor.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/emulator/car_emulator_vendor.mk b/emulator/car_emulator_vendor.mk
index 37669d9..64033f5 100644
--- a/emulator/car_emulator_vendor.mk
+++ b/emulator/car_emulator_vendor.mk
@@ -141,5 +141,17 @@ $(call inherit-product, device/generic/car/emulator/cluster/cluster-hwserviceman
endif # BUILD_EMULATOR_CLUSTER_DISPLAY
endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG
+# Should use car bluetooth.prop.
+# This replaces value from device/generic/goldfish/64bitonly/product/vendor.mk below
+ifeq (,$(ENABLE_CAR_USB_PASSTHROUGH))
+ENABLE_CAR_USB_PASSTHROUGH := false
+endif
+ifeq (true,$(ENABLE_CAR_USB_PASSTHROUGH))
+TARGET_PRODUCT_PROP := device/generic/car/emulator/usbpt/bluetooth/bluetooth.prop
+endif
+
# Goldfish vendor partition configurations
$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk)
+
+# Enable socket for qemu VHAL
+BOARD_SEPOLICY_DIRS += device/generic/car/emulator/sepolicy