From b3cdbfcb78df1de4f07495f0051a416a1d88850e Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Tue, 25 Jun 2024 00:19:16 +0800
Subject: [PATCH] sm6375-common: Migrate to QTI USB Gadget AIDL HAL

Change-Id: I6adbca2fab9a3fe0477d17f9786166828b786710
---
 common.mk   | 4 +++-
 vendor.prop | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index d3a68b1..96e1034 100644
--- a/common.mk
+++ b/common.mk
@@ -317,8 +317,10 @@ PRODUCT_PACKAGES_DEBUG += \
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb-service.qti \
+    android.hardware.usb.gadget-service.qti \
     init.qcom.usb.rc \
-    init.qcom.usb.sh
+    init.qcom.usb.sh \
+    usb_compositions.conf
 
 PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/usb/etc
 
diff --git a/vendor.prop b/vendor.prop
index 4dddac7..2ba3886 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -325,7 +325,7 @@ vendor.usb.rmnet.func.name=gsi
 vendor.usb.rmnet.inst.name=rmnet
 vendor.usb.rndis.func.name=gsi
 vendor.usb.use_ffs_mtp=1
-vendor.usb.use_gadget_hal=0
+vendor.usb.use_gadget_hal=1
 
 # ZRAM
 ro.vendor.zram.swapon=true