Revert "Fix Ok Google - Voice Match"
This reverts commit b1f07c0aff21f343c0318cebfc0d91af8b8f44a9.
diff --git a/Huawei/HotwordEnrollment/Android.mk b/Huawei/HotwordEnrollment/Android.mk
deleted file mode 100644
index 6fd90cd..0000000
--- a/Huawei/HotwordEnrollment/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 96a2d14..0000000
--- a/Huawei/HotwordEnrollment/HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk
+++ /dev/null
Binary files differ
diff --git a/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk b/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk
deleted file mode 100644
index f978cd7..0000000
--- a/Huawei/HotwordEnrollment/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk
+++ /dev/null
Binary files differ
diff --git a/overlay.mk b/overlay.mk
index 57b939a..ab351e1 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -25,10 +25,8 @@
HardwareOverlayPicker \
QtiAudio \
Touchscreen \
- android.hidl.base@1.0 \
- android.hidl.manager@1.0 \
- HotwordEnrollmentOKGoogleHI6403 \
- HotwordEnrollmentXGoogleHI6403
+ android.hidl.base@1.0 \
+ android.hidl.manager@1.0
PRODUCT_PACKAGES += \
hw-fpnav-daemon