Merge remote-tracking branch 'refs/remotes/bbp/o8.1-gsi-dev'
Conflicts:
overlay.mk
diff --git a/Huawei/HotwordEnrollment/Android.mk b/Huawei/HotwordEnrollment/Android.mk
new file mode 100644
index 0000000..6fd90cd
--- /dev/null
+++ b/Huawei/HotwordEnrollment/Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HotwordEnrollmentOKGoogleHI6403
+LOCAL_MODULE_OWNER := honor
+LOCAL_SRC_FILES := HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HotwordEnrollmentXGoogleHI6403
+LOCAL_MODULE_OWNER := honor
+LOCAL_SRC_FILES := HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
diff --git a/Huawei/HotwordEnrollment/HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk b/Huawei/HotwordEnrollment/HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk
new file mode 100644
index 0000000..96a2d14
--- /dev/null
+++ b/Huawei/HotwordEnrollment/HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk
Binary files differ
diff --git a/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk b/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk
new file mode 100644
index 0000000..f978cd7
--- /dev/null
+++ b/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk
Binary files differ
diff --git a/Huawei/HwCamera2/Android.mk b/Huawei/HwCamera2/Android.mk
new file mode 100644
index 0000000..a3f3382
--- /dev/null
+++ b/Huawei/HwCamera2/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HwCamera2
+LOCAL_MODULE_OWNER := honor
+LOCAL_SRC_FILES := HwCamera2.apk
+LOCAL_OVERRIDES_PACKAGES := Camera2
+LOCAL_CERTIFICATE := shared
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
diff --git a/Huawei/HwCamera2/HwCamera2.apk b/Huawei/HwCamera2/HwCamera2.apk
new file mode 100644
index 0000000..73c79a2
--- /dev/null
+++ b/Huawei/HwCamera2/HwCamera2.apk
Binary files differ
diff --git a/Huawei/HwCamera2/lib/android.hidl.base@1.0.so b/Huawei/HwCamera2/lib/android.hidl.base@1.0.so
new file mode 100644
index 0000000..5d98e72
--- /dev/null
+++ b/Huawei/HwCamera2/lib/android.hidl.base@1.0.so
Binary files differ
diff --git a/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so b/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so
new file mode 100644
index 0000000..4d0a951
--- /dev/null
+++ b/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so
Binary files differ
diff --git a/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so b/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so
new file mode 100644
index 0000000..ec55254
--- /dev/null
+++ b/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so
Binary files differ
diff --git a/Huawei/libhidl/Android.mk b/Huawei/libhidl/Android.mk
new file mode 100644
index 0000000..25e165d
--- /dev/null
+++ b/Huawei/libhidl/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libhidltransport
+LOCAL_MODULE := android.hidl.base@1.0
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libhidltransport
+LOCAL_MODULE := android.hidl.manager@1.0
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_SHARED_LIBRARY)
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