Merge remote-tracking branch 'refs/remotes/bbp/o8.1-gsi-dev'
Conflicts:
overlay.mk
diff --git a/overlay.mk b/overlay.mk
index b50e519..cab14d1 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -20,8 +20,21 @@
treble-overlay-xiaomi-mimix2s \
treble-overlay-xiaomi-redmi6pro \
HardwareOverlayPicker \
- QtiAudio
+ QtiAudio \
+ Touchscreen \
+ android.hidl.base@1.0 \
+ android.hidl.manager@1.0 \
+ HotwordEnrollmentOKGoogleHI6403 \
+ HotwordEnrollmentXGoogleHI6403
+# Huawei Camera
+PRODUCT_COPY_FILES += \
+ vendor/hardware_overlay/Huawei/HwCamera2/lib/android.hidl.base@1.0.so:system/lib/android.hid$
+ vendor/hardware_overlay/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so:system/lib64/android$
+ vendor/hardware_overlay/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so:system/lib64/libHwPost$
+
+PRODUCT_PACKAGES += \
+ HwCamera2
PRODUCT_PACKAGES += \
hw-fpnav-daemon