From edcbe9aedc556d925d8defa2e5b5d33ab5c53974 Mon Sep 17 00:00:00 2001
From: Sriharsha Allenki <sallenki@codeaurora.org>
Date: Mon, 31 Jul 2017 14:14:41 +0530
Subject: [PATCH] sdm660: Add USB binderized HAL service to PRODUCT_PACKAGES

The Treble project introduced binderized hal in Android O.
For USB part, its Binderized hal was not compiled, thus the usb_hal
service which was implemented in the hal can not be loaded by
UsbPortManager.
Add android.hardware.usb@1.0-service to PRODUCT_PACKAGES.

Change-Id: I6269b4f3fd982bc22abd21ef8a84e7b51bfb11f7
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
---
 manifest.xml | 10 ++++++++++
 sdm660_64.mk |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/manifest.xml b/manifest.xml
index 5030656c..23d23a13 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -483,6 +483,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            </interface>
     </hal>
 
+    <hal format="hidl">
+        <name>android.hardware.usb</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUsb</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+
     <!-- Alarm HAL service -->
     <hal format="hidl">
         <name>vendor.qti.hardware.alarm</name>
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 4784e68b..86dfeb7d 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -170,6 +170,9 @@ PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-impl
 # Enable binderized camera HAL
 PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-service
 
+PRODUCT_PACKAGES += \
+	android.hardware.usb@1.0-service
+
 # Sensor features
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \