Merge 4962c87eed91ab25a1bc1c9e3cd4295caba209eb on remote branch
Change-Id: I2916ca1826fc2cb106268150af94ad00ba810965
diff --git a/vendor_product.mk b/vendor_product.mk
index 0b2cbeb..9e07603 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -9,12 +9,13 @@
ifneq ($(filter bengal monaco,$(TARGET_BOARD_PLATFORM)),)
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.controller=4e00000.dwc3
+ PRODUCT_PROPERTY_OVERRIDES += ro.boot.usb.dwc3_msm=4e00000.ssusb
else
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.controller=a600000.dwc3
endif
# QDSS uses SW path on these targets
-ifneq ($(filter lahaina taro bengal kalama monaco,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter lahaina taro bengal kalama monaco kona,$(TARGET_BOARD_PLATFORM)),)
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss_sw
else
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss
@@ -52,7 +53,7 @@
# USB Gadget HAL is enabled on newer targets and takes the place
# of the init-based configfs rules for setting USB compositions
#
- ifneq ($(filter taro kalama bengal monaco,$(TARGET_BOARD_PLATFORM)),)
+ ifneq ($(filter taro kalama bengal monaco kona,$(TARGET_BOARD_PLATFORM)),)
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.use_gadget_hal=1
PRODUCT_PACKAGES += android.hardware.usb.gadget@1.1-service-qti
PRODUCT_PACKAGES += usb_compositions.conf