Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b90d2b authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

Merge branch '1410-a14-mtk' into 'a14' 

vendor/lineage: Hookup TARGET_USES_MTK_APNS_CONF & copy mtk apns from tetris

See merge request !221
parents 1c20a58b 4840bcc8

config/BoardConfigSoong.mk

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ SOONG_CONFIG_lineageGlobalVars += \ 
    target_trust_usb_control_path \

    target_trust_usb_control_enable \

    target_trust_usb_control_disable \

    uses_mtk_apns_conf \

    uses_egl_display_array



SOONG_CONFIG_NAMESPACES += lineageNvidiaVars
@@ -113,6 +114,7 @@ TARGET_SURFACEFLINGER_UDFPS_LIB ?= surfaceflinger_udfps_lib 
TARGET_TRUST_USB_CONTROL_PATH ?= /proc/sys/kernel/deny_new_usb

TARGET_TRUST_USB_CONTROL_ENABLE ?= 1

TARGET_TRUST_USB_CONTROL_DISABLE ?= 0

TARGET_USES_MTK_APNS_CONF ?= false



# Soong value variables

SOONG_CONFIG_lineageGlobalVars_aapt_version_code := $(shell date -u +%Y%m%d)
@@ -135,6 +137,7 @@ SOONG_CONFIG_lineageGlobalVars_target_surfaceflinger_udfps_lib := $(TARGET_SURFA 
SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_path := $(TARGET_TRUST_USB_CONTROL_PATH)

SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_enable := $(TARGET_TRUST_USB_CONTROL_ENABLE)

SOONG_CONFIG_lineageGlobalVars_target_trust_usb_control_disable := $(TARGET_TRUST_USB_CONTROL_DISABLE)

SOONG_CONFIG_lineageGlobalVars_uses_mtk_apns_conf := $(TARGET_USES_MTK_APNS_CONF)

ifneq ($(filter $(QSSI_SUPPORTED_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)

SOONG_CONFIG_lineageQcomVars_qcom_display_headers_namespace := vendor/qcom/opensource/commonsys-intf/display

else

prebuilt/common/Android.bp

+17 −2
Original line number Diff line number Diff line 
prebuilt_etc_xml {

soong_config_module_type {

    name: "apns_conf_prebuilt_etc_xml",

    module_type: "prebuilt_etc_xml",

    config_namespace: "lineageGlobalVars",

    bool_variables: ["uses_mtk_apns_conf"],

    properties: ["src"],

}



apns_conf_prebuilt_etc_xml {

    name: "apns-conf.xml",

    product_specific: true,

    src: "etc/apns-conf.xml",

    schema: ":apns-conf-schema",

    soong_config_variables: {

        uses_mtk_apns_conf: {

           src: "etc/apns-conf-mtk.xml",

            conditions_default: {

                src: "etc/apns-conf.xml",

            },

        },

    },

}



prebuilt_etc_xml {

prebuilt/common/etc/apns-conf-mtk.xml

0 → 100644
+48507 −0

File added.

Preview size limit exceeded, changes collapsed.