Revert "Revert "Add built-in stock Huawei camera and libs""
This reverts commit 8c5b1085fdc59057fc55fb027a26c5d2441fed6b.
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/overlay.mk b/overlay.mk
index 3fb1abc..f0dafdb 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -29,6 +29,15 @@
android.hidl.base@1.0 \
android.hidl.manager@1.0
+# Huawei Camera
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/HwCamera2/lib/android.hidl.base@1.0.so:system/lib/android.hid$
+ $(LOCAL_PATH)/HwCamera2/lib64/android.hidl.base@1.0.so:system/lib64/android$
+ $(LOCAL_PATH)/HwCamera2/lib64/libHwPostCamera_jni.so:system/lib64/libHwPost$
+
+PRODUCT_PACKAGES += \
+ HwCamera2
+
PRODUCT_PACKAGES += \
hw-fpnav-daemon
PRODUCT_COPY_FILES += \