bliss: Move paackages to separate makefile
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I650d6f5437ab0c75e1107c48340f91349f7b8089
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
new file mode 100644
index 0000000..05000ea
--- /dev/null
+++ b/config/bliss_packages.mk
@@ -0,0 +1,85 @@
+# World APN list
+PRODUCT_PACKAGES += \
+ apns-conf.xml
+
+# AOSP packages
+PRODUCT_PACKAGES += \
+ Email \
+ ExactCalculator \
+ Exchange2 \
+ LiveWallpapersPicker \
+ messaging \
+ PhotoTable
+
+# Bliss Packages
+PRODUCT_PACKAGES += \
+ LatinIME \
+ Recorder \
+ LineageParts \
+ LineageSettingsProvider \
+ LockClock \
+ Profiles \
+ WeatherProvider
+
+# Bootanimation
+PRODUCT_PACKAGES += \
+ bootanimation.zip
+
+# Dex preopt
+PRODUCT_DEXPREOPT_SPEED_APPS += \
+ SystemUI \
+ TrebuchetQuickStep
+
+# Extra tools in bliss
+PRODUCT_PACKAGES += \
+ 7z \
+ awk \
+ bash \
+ bzip2 \
+ curl \
+ getcap \
+ htop \
+ lib7z \
+ libsepol \
+ nano \
+ pigz \
+ powertop \
+ setcap \
+ unrar \
+ unzip \
+ vim \
+ wget \
+ zip
+
+# Filesystems tools
+PRODUCT_PACKAGES += \
+ fsck.exfat \
+ fsck.ntfs \
+ mke2fs \
+ mkfs.exfat \
+ mkfs.ntfs \
+ mount.ntfs
+
+# Openssh
+PRODUCT_PACKAGES += \
+ scp \
+ sftp \
+ ssh \
+ sshd \
+ sshd_config \
+ ssh-keygen \
+ start-ssh
+
+# rsync
+PRODUCT_PACKAGES += \
+ rsync
+
+# These packages are excluded from user builds
+PRODUCT_PACKAGES_DEBUG += \
+ procmem
+
+# Telephony packages
+PRODUCT_PACKAGES += \
+ Stk \
+ CellBroadcastReceiver
+
diff --git a/config/common.mk b/config/common.mk
index 4eed1fb..4405a2c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -101,78 +101,10 @@
# Disable vendor restrictions
PRODUCT_RESTRICT_VENDOR_FILES := false
-# Bootanimation
-PRODUCT_PACKAGES += \
- bootanimation.zip
-
-# AOSP packages
-PRODUCT_PACKAGES += \
- Terminal
-
-# Lineage packages
-PRODUCT_PACKAGES += \
- LineageParts \
- LineageSettingsProvider \
- LineageSetupWizard \
- Updater
-
-# Themes
-PRODUCT_PACKAGES += \
- LineageThemesStub \
- ThemePicker
-
-# Extra tools in bliss
-PRODUCT_PACKAGES += \
- 7z \
- awk \
- bash \
- bzip2 \
- curl \
- getcap \
- htop \
- lib7z \
- libsepol \
- nano \
- pigz \
- powertop \
- setcap \
- unrar \
- unzip \
- vim \
- wget \
- zip
-
-# Filesystems tools
-PRODUCT_PACKAGES += \
- fsck.exfat \
- fsck.ntfs \
- mke2fs \
- mkfs.exfat \
- mkfs.ntfs \
- mount.ntfs
-
-# Openssh
-PRODUCT_PACKAGES += \
- scp \
- sftp \
- ssh \
- sshd \
- sshd_config \
- ssh-keygen \
- start-ssh
-
-# rsync
-PRODUCT_PACKAGES += \
- rsync
-
# Storage manager
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
ro.storage_manager.enabled=true
-# These packages are excluded from user builds
-PRODUCT_PACKAGES_DEBUG += \
- procmem
-
# Root
PRODUCT_PACKAGES += \
adb_root
@@ -183,13 +115,9 @@
endif
endif
-# Dex preopt
-PRODUCT_DEXPREOPT_SPEED_APPS += \
- SystemUI \
- TrebuchetQuickStep
-
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/bliss/overlay
DEVICE_PACKAGE_OVERLAYS += vendor/bliss/overlay/common
+-include vendor/bliss/config/bliss_packages.mk
-include $(WORKSPACE)/build_env/image-auto-bits.mk
-include vendor/bliss/config/partner_gms.mk
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index a86c106..ef8a5bc 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -11,44 +11,6 @@
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.dun.override=0
endif
-# Optional packages
-PRODUCT_PACKAGES += \
- LiveWallpapersPicker \
- PhotoTable
-
-# AOSP packages
-PRODUCT_PACKAGES += \
- Email \
- ExactCalculator \
- Exchange2
-
-# bliss packages
-PRODUCT_PACKAGES += \
- AudioFX \
- Backgrounds \
- Eleven \
- Etar \
- Jelly \
- LockClock \
- Profiles \
- TrebuchetQuickStep \
- WeatherProvider
-
-# Accents
-PRODUCT_PACKAGES += \
- LineageBlackTheme \
- LineageDarkTheme \
- LineageBlackAccent \
- LineageBlueAccent \
- LineageBrownAccent \
- LineageCyanAccent \
- LineageGreenAccent \
- LineageOrangeAccent \
- LineagePinkAccent \
- LineagePurpleAccent \
- LineageRedAccent \
- LineageYellowAccent
-
# Charger
PRODUCT_PACKAGES += \
charger_res_images