diff options
author | Aaron Kling <webgeek1234@gmail.com> | 2020-02-22 01:25:46 -0600 |
---|---|---|
committer | Rashed Abdel-Tawab <rashedabdeltawab@gmail.com> | 2020-04-22 02:18:15 +0200 |
commit | 892699086568ffa417a9ce50767b50696d7614d9 (patch) | |
tree | eb6980764f950800866b56564fceb0fbbc8daa99 | |
parent | c0b837dbc81ec4f5215132f3ac61bf4cb488703e (diff) | |
download | vendor_lineage-892699086568ffa417a9ce50767b50696d7614d9.tar.gz vendor_lineage-892699086568ffa417a9ce50767b50696d7614d9.tar.bz2 vendor_lineage-892699086568ffa417a9ce50767b50696d7614d9.zip |
Split mobile and tv configs
There are a lot of apps installed by default that are unusable with
a controller. This splits the mobile related settings out of common
into a common_mobile config and adds common_tv.
Note: The EXCLUDE_AUDIOFX flag was removed from the tv configs
because the new config path no longer builds it.
Change-Id: I67db32750fca91725d703243f2bcee8bcd9b82cd
-rw-r--r-- | config/common.mk | 49 | ||||
-rw-r--r-- | config/common_full.mk | 2 | ||||
-rw-r--r-- | config/common_full_tv.mk | 16 | ||||
-rw-r--r-- | config/common_mini.mk | 2 | ||||
-rw-r--r-- | config/common_mini_tv.mk | 7 | ||||
-rw-r--r-- | config/common_mobile.mk | 65 | ||||
-rw-r--r-- | config/common_tv.mk | 11 |
7 files changed, 85 insertions, 67 deletions
diff --git a/config/common.mk b/config/common.mk index 36e39d77..cd509d33 100644 --- a/config/common.mk +++ b/config/common.mk @@ -13,11 +13,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE) endif -# Default notification/alarm sounds -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - ro.config.notification_sound=Argon.ogg \ - ro.config.alarm_alert=Hassium.ogg - ifeq ($(TARGET_BUILD_VARIANT),eng) # Disable ADB authentication PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.adb.secure=0 @@ -127,40 +122,14 @@ PRODUCT_PACKAGES += \ # AOSP packages PRODUCT_PACKAGES += \ - Email \ - ExactCalculator \ - Exchange2 \ Terminal # Lineage packages PRODUCT_PACKAGES += \ - AudioFX \ - Backgrounds \ LineageParts \ LineageSettingsProvider \ LineageSetupWizard \ - Eleven \ - Jelly \ - LockClock \ - Profiles \ - TrebuchetQuickStep \ - Updater \ - WeatherProvider - -# Accents -PRODUCT_PACKAGES += \ - LineageBlackTheme \ - LineageDarkTheme \ - LineageBlackAccent \ - LineageBlueAccent \ - LineageBrownAccent \ - LineageCyanAccent \ - LineageGreenAccent \ - LineageOrangeAccent \ - LineagePinkAccent \ - LineagePurpleAccent \ - LineageRedAccent \ - LineageYellowAccent + Updater # Themes PRODUCT_PACKAGES += \ @@ -188,18 +157,6 @@ PRODUCT_PACKAGES += \ wget \ zip -# Charger -PRODUCT_PACKAGES += \ - charger_res_images - -# Custom off-mode charger -ifeq ($(WITH_LINEAGE_CHARGER),true) -PRODUCT_PACKAGES += \ - lineage_charger_res_images \ - font_log.png \ - libhealthd.lineage -endif - # Filesystems tools PRODUCT_PACKAGES += \ fsck.exfat \ @@ -227,10 +184,6 @@ PRODUCT_PACKAGES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ ro.storage_manager.enabled=true -# Media -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - media.recorder.show_manufacturer_and_model=true - # These packages are excluded from user builds PRODUCT_PACKAGES_DEBUG += \ procmem diff --git a/config/common_full.mk b/config/common_full.mk index 8a2b02ee..67bfa73c 100644 --- a/config/common_full.mk +++ b/config/common_full.mk @@ -1,5 +1,5 @@ # Inherit common Lineage stuff -$(call inherit-product, vendor/lineage/config/common.mk) +$(call inherit-product, vendor/lineage/config/common_mobile.mk) PRODUCT_SIZE := full diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk index 4df99798..416fed01 100644 --- a/config/common_full_tv.mk +++ b/config/common_full_tv.mk @@ -1,14 +1,4 @@ -# Exclude AudioFX -TARGET_EXCLUDES_AUDIOFX := true +# This config is for legacy purposes, there are no atv product size variants -# Inherit full common Lineage stuff -$(call inherit-product, vendor/lineage/config/common_full.mk) - -# Inherit Lineage atv device tree -$(call inherit-product, device/lineage/atv/lineage_atv.mk) - -PRODUCT_PACKAGES += \ - AppDrawer \ - LineageCustomizer - -DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/tv +# Inherit common atv Lineage stuff +$(call inherit-product, vendor/lineage/config/common_tv.mk) diff --git a/config/common_mini.mk b/config/common_mini.mk index 49caa028..8e8f88f2 100644 --- a/config/common_mini.mk +++ b/config/common_mini.mk @@ -1,4 +1,4 @@ # Inherit mini common Lineage stuff -$(call inherit-product, vendor/lineage/config/common.mk) +$(call inherit-product, vendor/lineage/config/common_mobile.mk) PRODUCT_SIZE := mini diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk index 83409fb2..416fed01 100644 --- a/config/common_mini_tv.mk +++ b/config/common_mini_tv.mk @@ -1,5 +1,4 @@ -# Exclude AudioFX -TARGET_EXCLUDES_AUDIOFX := true +# This config is for legacy purposes, there are no atv product size variants -# Inherit mini common Lineage stuff -$(call inherit-product, vendor/lineage/config/common_mini.mk) +# Inherit common atv Lineage stuff +$(call inherit-product, vendor/lineage/config/common_tv.mk) diff --git a/config/common_mobile.mk b/config/common_mobile.mk new file mode 100644 index 00000000..37b96587 --- /dev/null +++ b/config/common_mobile.mk @@ -0,0 +1,65 @@ +# Inherit common mobile Lineage stuff +$(call inherit-product, vendor/lineage/config/common.mk) + +# Default notification/alarm sounds +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + ro.config.notification_sound=Argon.ogg \ + ro.config.alarm_alert=Hassium.ogg + +ifneq ($(TARGET_BUILD_VARIANT),user) +# Thank you, please drive thru! +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.dun.override=0 +endif + +# Optional packages +PRODUCT_PACKAGES += \ + LiveWallpapersPicker \ + PhotoTable + +# AOSP packages +PRODUCT_PACKAGES += \ + Email \ + ExactCalculator \ + Exchange2 + +# Lineage packages +PRODUCT_PACKAGES += \ + AudioFX \ + Backgrounds \ + Eleven \ + 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 + +# Custom off-mode charger +ifeq ($(WITH_LINEAGE_CHARGER),true) +PRODUCT_PACKAGES += \ + lineage_charger_res_images \ + font_log.png \ + libhealthd.lineage +endif + +# Media +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + media.recorder.show_manufacturer_and_model=true diff --git a/config/common_tv.mk b/config/common_tv.mk new file mode 100644 index 00000000..08e2c2cf --- /dev/null +++ b/config/common_tv.mk @@ -0,0 +1,11 @@ +# Inherit common Lineage stuff +$(call inherit-product, vendor/lineage/config/common.mk) + +# Inherit Lineage atv device tree +$(call inherit-product, device/lineage/atv/lineage_atv.mk) + +PRODUCT_PACKAGES += \ + AppDrawer \ + LineageCustomizer + +DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/tv |