Make things cleaner
diff --git a/Huawei/Overlay/Android.mk b/Huawei/Generic/Android.mk
similarity index 100%
rename from Huawei/Overlay/Android.mk
rename to Huawei/Generic/Android.mk
diff --git a/Huawei/Overlay/AndroidManifest.xml b/Huawei/Generic/AndroidManifest.xml
similarity index 100%
rename from Huawei/Overlay/AndroidManifest.xml
rename to Huawei/Generic/AndroidManifest.xml
diff --git a/Huawei/Overlay/res/values/config.xml b/Huawei/Generic/res/values/config.xml
similarity index 100%
rename from Huawei/Overlay/res/values/config.xml
rename to Huawei/Generic/res/values/config.xml
diff --git a/Huawei/P20Lite/Android.mk b/Huawei/P20Lite/Android.mk
deleted file mode 100644
index 6cd06b4..0000000
--- a/Huawei/P20Lite/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-huawei-p20l
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_PACKAGE)
diff --git a/Huawei/P20Lite/AndroidManifest.xml b/Huawei/P20Lite/AndroidManifest.xml
deleted file mode 100644
index 4c9ce3d..0000000
--- a/Huawei/P20Lite/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="me.phh.treble.overlay.huawei.p20l"
- android:versionCode="1"
- android:versionName="1.0">
- <overlay android:targetPackage="android"
- android:requiredSystemPropertyName="ro.product.board"
- android:requiredSystemPropertyValue="ANE"
- android:priority="30"
- android:isStatic="true" />
-</manifest>
diff --git a/Huawei/hi3660/DUK/Android.mk b/Huawei/hi3660/DUK/Android.mk
index 862bc6d..9603b58 100644
--- a/Huawei/hi3660/DUK/Android.mk
+++ b/Huawei/hi3660/DUK/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-DUK
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-DUK
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi3660/STF/Android.mk b/Huawei/hi3660/STF/Android.mk
index e41ffbd..47bc214 100644
--- a/Huawei/hi3660/STF/Android.mk
+++ b/Huawei/hi3660/STF/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-STF
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-STF
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi3660/VTR/Android.mk b/Huawei/hi3660/VTR/Android.mk
index 1f004b6..d03f026 100644
--- a/Huawei/hi3660/VTR/Android.mk
+++ b/Huawei/hi3660/VTR/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-VTR
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-VTR
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi6250/ANE/Android.mk b/Huawei/hi6250/ANE/Android.mk
index c71ea77..5f8cd17 100644
--- a/Huawei/hi6250/ANE/Android.mk
+++ b/Huawei/hi6250/ANE/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-ANE
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-ANE
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/P20Lite/res/values-land/notch.xml b/Huawei/hi6250/ANE/res/values-land/notch.xml
similarity index 100%
rename from Huawei/P20Lite/res/values-land/notch.xml
rename to Huawei/hi6250/ANE/res/values-land/notch.xml
diff --git a/Huawei/P20Lite/res/values/notch.xml b/Huawei/hi6250/ANE/res/values/notch.xml
similarity index 100%
rename from Huawei/P20Lite/res/values/notch.xml
rename to Huawei/hi6250/ANE/res/values/notch.xml
diff --git a/Huawei/hi6250/BND/Android.mk b/Huawei/hi6250/BND/Android.mk
index 06d1283..074c336 100644
--- a/Huawei/hi6250/BND/Android.mk
+++ b/Huawei/hi6250/BND/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-BND
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-BND
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi6250/LLD/Android.mk b/Huawei/hi6250/LLD/Android.mk
index 4dfbbd4..c90e491 100644
--- a/Huawei/hi6250/LLD/Android.mk
+++ b/Huawei/hi6250/LLD/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-LLD
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-LLD
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi6250/PRA/Android.mk b/Huawei/hi6250/PRA/Android.mk
index 8076aee..06b56f4 100644
--- a/Huawei/hi6250/PRA/Android.mk
+++ b/Huawei/hi6250/PRA/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-PRA
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-PRA
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi6250/RNE/Android.mk b/Huawei/hi6250/RNE/Android.mk
index b84a2a6..bc65d95 100644
--- a/Huawei/hi6250/RNE/Android.mk
+++ b/Huawei/hi6250/RNE/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-RNE
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-RNE
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Huawei/hi6250/WAS/Android.mk b/Huawei/hi6250/WAS/Android.mk
index 8758aa8..0814481 100644
--- a/Huawei/hi6250/WAS/Android.mk
+++ b/Huawei/hi6250/WAS/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := dil3mm4-overlay-WAS
+LOCAL_PACKAGE_NAME := treble-overlay-huawei-WAS
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/overlay.mk b/overlay.mk
index 85797d8..7ee7e44 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -2,7 +2,15 @@
treble-overlay-asus-zenfone5 \
treble-overlay-asus-zenfone5z \
treble-overlay-huawei \
- treble-overlay-huawei-p20l \
+ treble-overlay-huawei-DUK \
+ treble-overlay-huawei-STF \
+ treble-overlay-huawei-VTR \
+ treble-overlay-huawei-ANE \
+ treble-overlay-huawei-BND \
+ treble-overlay-huawei-LLD \
+ treble-overlay-huawei-PRA \
+ treble-overlay-huawei-RNE \
+ treble-overlay-huawei-WAS \
treble-overlay-huawei-telephony \
treble-overlay-lg-g7 \
treble-overlay-NavBar \