diff options
| author | Roman Kiryanov <rkir@google.com> | 2024-01-26 08:14:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-26 08:14:59 +0000 |
| commit | 92a8db3317f0b8ce32017605a480ff1d82ae896b (patch) | |
| tree | 88d689157a78667dc3ee989875592c8c030b43bd | |
| parent | 1bfb17fe62fcbac08b9ae0670dc982e54e0a3ab9 (diff) | |
| parent | 1bd715bcdf1bb274ce17299791426592150067b3 (diff) | |
| download | car-92a8db3317f0b8ce32017605a480ff1d82ae896b.tar.gz | |
Include product/generic.mk instead of 64bitonly/product/vendor.mk am: 1bd715bcdf
Original change: https://android-review.googlesource.com/c/device/generic/car/+/2927724
Change-Id: I70d98342ee8f0e3ed7567a24f96d77d1b8ccf71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | emulator/car_emulator_vendor.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/car_emulator_vendor.mk b/emulator/car_emulator_vendor.mk index 64033f5..8a4b0fb 100644 --- a/emulator/car_emulator_vendor.mk +++ b/emulator/car_emulator_vendor.mk @@ -142,7 +142,7 @@ 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 +# This replaces value from device/generic/goldfish/product/generic.mk below ifeq (,$(ENABLE_CAR_USB_PASSTHROUGH)) ENABLE_CAR_USB_PASSTHROUGH := false endif @@ -151,7 +151,7 @@ TARGET_PRODUCT_PROP := device/generic/car/emulator/usbpt/bluetooth/bluetooth.pro endif # Goldfish vendor partition configurations -$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk) +$(call inherit-product, device/generic/goldfish/product/generic.mk) # Enable socket for qemu VHAL BOARD_SEPOLICY_DIRS += device/generic/car/emulator/sepolicy |