dt: split into fragments before hell

8 files changed, 45 insertions, 46 deletions

diff --git a/VendorConfig.mk b/VendorConfig.mk
index a4752eb..85e2095 100644
--- a/VendorConfig.mk
+++ b/VendorConfig.mk
@@ -2,33 +2,5 @@ VND_MTK_PATH := vendor/mediatek
 
 TARGET_SPECIFIC_HEADER_PATH := $(VND_MTK_PATH)/include
 
-# Disable dex pre-opt
-WITH_DEXPREOPT := false
-
-# Seccomp policy
-PRODUCT_COPY_FILES += \
-    $(VND_MTK_PATH)/seccomp_policy/mediacodec.policy:system/vendor/etc/seccomp_policy/mediacodec.policy \
-    $(VND_MTK_PATH)/seccomp_policy/mediaextractor.policy:system/vendor/etc/seccomp_policy/mediaextractor.policy
-
-# Google codecs
-PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:system/etc/media_codecs_google_video_le.xml
-
-# GPS
-PRODUCT_COPY_FILES += \
-    $(VND_MTK_PATH)/configs/gps/slp_conf:system/etc/slp_conf \
-    $(VND_MTK_PATH)/configs/gps/gps.conf:system/etc/gps.conf \
-    $(VND_MTK_PATH)/configs/gps/agps_profiles_conf2.xml:system/etc/agps_profiles_conf2.xml
-
-# Bluetooth
-PRODUCT_COPY_FILES += \
-    $(VND_MTK_PATH)/configs/bluetooth/auto_pair_devlist.conf:system/etc/bluetooth/auto_pair_devlist.conf \
-    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf.debug:system/etc/bluetooth/bt_stack.conf.debug \
-    $(VND_MTK_PATH)/configs/bluetooth/bt_did.conf:system/etc/bluetooth/bt_did.conf \
-    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf:system/etc/bluetooth/bt_stack.conf \
-    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf.sqc:system/etc/bluetooth/bt_stack.conf.sqc
-
-# GC tweak
-PRODUCT_TAGS += dalvik.gc.type-precise
+# Fragments include
+-include $(VND_MTK_PATH)/board/*.mk
diff --git a/VendorProduct.mk b/VendorProduct.mk
index 679a00a..e8e2627 100644
--- a/VendorProduct.mk
+++ b/VendorProduct.mk
@@ -1,19 +1,5 @@
-# CM mediatek powerHAL
-PRODUCT_PACKAGES += \
-    power.default \
-    power.$(TARGET_BOARD_PLATFORM) \
-    vendor.lineage.power@1.0-impl
-    #android.hardware.power@1.0-impl // non-lineage imp
-
-#TARGET_TAP_TO_WAKE_NODE=
+# Fragments include
+-include $(VND_MTK_PATH)/product/*.mk
 
 # Mtk symbols & shim
 include $(VND_MTK_PATH)/Libshims.mk
-
-# Vibrator HAL
-PRODUCT_PACKAGES += \
-    android.hardware.vibrator@1.0-service.mediatek
-
-# Doze
-PRODUCT_PACKAGES += \
-    MeizuDoze
diff --git a/board/av.mk b/board/av.mk
new file mode 100644
index 0000000..78f1d27
--- /dev/null
+++ b/board/av.mk
@@ -0,0 +1,5 @@
+# Google codecs
+PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:system/etc/media_codecs_google_video_le.xml
diff --git a/board/common.mk b/board/common.mk
new file mode 100644
index 0000000..f2dee7b
--- /dev/null
+++ b/board/common.mk
@@ -0,0 +1,5 @@
+# Disable dex pre-opt
+WITH_DEXPREOPT := false
+
+# GC tweak
+PRODUCT_TAGS += dalvik.gc.type-precise
diff --git a/board/conn.mk b/board/conn.mk
new file mode 100644
index 0000000..7c96d68
--- /dev/null
+++ b/board/conn.mk
@@ -0,0 +1,13 @@
+# GPS
+PRODUCT_COPY_FILES += \
+    $(VND_MTK_PATH)/configs/gps/slp_conf:system/etc/slp_conf \
+    $(VND_MTK_PATH)/configs/gps/gps.conf:system/etc/gps.conf \
+    $(VND_MTK_PATH)/configs/gps/agps_profiles_conf2.xml:system/etc/agps_profiles_conf2.xml
+
+# Bluetooth
+PRODUCT_COPY_FILES += \
+    $(VND_MTK_PATH)/configs/bluetooth/auto_pair_devlist.conf:system/etc/bluetooth/auto_pair_devlist.conf \
+    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf.debug:system/etc/bluetooth/bt_stack.conf.debug \
+    $(VND_MTK_PATH)/configs/bluetooth/bt_did.conf:system/etc/bluetooth/bt_did.conf \
+    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf:system/etc/bluetooth/bt_stack.conf \
+    $(VND_MTK_PATH)/configs/bluetooth/bt_stack.conf.sqc:system/etc/bluetooth/bt_stack.conf.sqc
diff --git a/board/seccomp.mk b/board/seccomp.mk
new file mode 100644
index 0000000..ff3272d
--- /dev/null
+++ b/board/seccomp.mk
@@ -0,0 +1,4 @@
+# Seccomp policy
+PRODUCT_COPY_FILES += \
+    $(VND_MTK_PATH)/seccomp_policy/mediacodec.policy:system/vendor/etc/seccomp_policy/mediacodec.policy \
+    $(VND_MTK_PATH)/seccomp_policy/mediaextractor.policy:system/vendor/etc/seccomp_policy/mediaextractor.policy
diff --git a/product/hals.mk b/product/hals.mk
new file mode 100644
index 0000000..8ca3a46
--- /dev/null
+++ b/product/hals.mk
@@ -0,0 +1,12 @@
+# CM mediatek powerHAL
+PRODUCT_PACKAGES += \
+    power.default \
+    power.$(TARGET_BOARD_PLATFORM) \
+    vendor.lineage.power@1.0-impl
+    #android.hardware.power@1.0-impl // non-lineage imp
+
+#TARGET_TAP_TO_WAKE_NODE=
+
+# Vibrator HAL
+PRODUCT_PACKAGES += \
+    android.hardware.vibrator@1.0-service.mediatek
diff --git a/product/packages.mk b/product/packages.mk
new file mode 100644
index 0000000..aee4574
--- /dev/null
+++ b/product/packages.mk
@@ -0,0 +1,2 @@
+# Doze
+PRODUCT_PACKAGES += MeizuDoze