diff options
Diffstat (limited to 'shared/phone/device_vendor.mk')
| -rw-r--r-- | shared/phone/device_vendor.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk index a9be2ced5..678c640f8 100644 --- a/shared/phone/device_vendor.mk +++ b/shared/phone/device_vendor.mk @@ -25,8 +25,8 @@ PRODUCT_COPY_FILES += \ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) $(call inherit-product, device/google/cuttlefish/shared/biometrics_face/device_vendor.mk) +$(call inherit-product, device/google/cuttlefish/shared/biometrics_fingerprint/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/bluetooth/device_vendor.mk) -$(call inherit-product, device/google/cuttlefish/shared/camera/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/consumerir/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/gnss/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/graphics/device_vendor.mk) @@ -40,15 +40,18 @@ $(call inherit-product, device/google/cuttlefish/shared/sensors/device_vendor.mk $(call inherit-product, device/google/cuttlefish/shared/virgl/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/device.mk) +# Loads the camera HAL and which set of cameras is required. +$(call inherit-product, device/google/cuttlefish/shared/camera/device_vendor.mk) +$(call inherit-product, device/google/cuttlefish/shared/camera/config/standard.mk) + # Support mixing CF system onto previous versions of vendor -PRODUCT_EXTRA_VNDK_VERSIONS := 30 31 32 33 +PRODUCT_EXTRA_VNDK_VERSIONS := 30 31 32 33 34 TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \ - frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ ifneq ($(TARGET_DISABLE_BIOMETRICS_FACE),true) PRODUCT_COPY_FILES += \ |