config: Move LatinIME stuff to common_mobile*.mk

Change-Id: I5697e1cef84972a6a7f76b8c065e575e1ba17ef8
2024-07-21 20:27:31 +02:00
parent 799d122416
commit 82cb3dc497
8 changed files with 6 additions and 37 deletions
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,14 +1,6 @@
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Enable support of one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.support_one_handed_mode?=true
--- a/config/common_full_tablet.mk
+++ b/config/common_full_tablet.mk
@@ -3,14 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Settings
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.settings.large_screen_opt.enabled=true
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -3,14 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 # Inherit mobile full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_full.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
-# Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
-
 # Settings
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.settings.large_screen_opt.enabled=true
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/telephony.mk)
--- a/config/common_mini_tablet.mk
+++ b/config/common_mini_tablet.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/telephony.mk)
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -1,8 +1,4 @@
 # Inherit mobile mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)

-# Required packages
-PRODUCT_PACKAGES += \
-    LatinIME
-
 $(call inherit-product, vendor/lineage/config/wifionly.mk)
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -16,7 +16,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Apps
 PRODUCT_PACKAGES += \
    Backgrounds \
-    Glimpse
+    Glimpse \
+    LatinIME

 ifeq ($(PRODUCT_TYPE), go)
 PRODUCT_PACKAGES += \
--- a/config/common_mobile_full.mk
+++ b/config/common_mobile_full.mk
@@ -35,3 +35,7 @@ PRODUCT_PACKAGES += \
    fonts_customization.xml \
    FontLatoOverlay \
    FontRubikOverlay
+
+# Include Lineage LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries