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

Commit 35f02152 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'lineage-20.0' into v1-t

parents 94380fb6 c3dda454

build/core/vendor/qcom_boards.mk

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ATOLL := atoll #SM6250 
LAHAINA := lahaina #SM8350

HOLI := holi #SM4350

TARO := taro #SM8450

KALAMA := kalama #SM8550



# UM Family

QCOM_BOARD_PLATFORMS += msm8937
@@ -34,3 +35,4 @@ QCOM_BOARD_PLATFORMS += $(ATOLL) 
QCOM_BOARD_PLATFORMS += $(LAHAINA)

QCOM_BOARD_PLATFORMS += $(HOLI)

QCOM_BOARD_PLATFORMS += $(TARO)

QCOM_BOARD_PLATFORMS += $(KALAMA)

build/soong/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -88,6 +88,23 @@ gralloc_10_usage_bits { 
    },

}



soong_config_module_type {

    name: "gralloc_handle_custom_content_md_reserved_size",

    module_type: "cc_defaults",

    config_namespace: "lineageGlobalVars",

    bool_variables: ["gralloc_handle_has_custom_content_md_reserved_size"],

    properties: ["export_cflags"],

}



gralloc_handle_custom_content_md_reserved_size {

    name: "gralloc_handle_has_custom_content_md_reserved_size_defaults",

    soong_config_variables: {

        gralloc_handle_has_custom_content_md_reserved_size: {

            export_cflags: ["-DGRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE"],

        },

    },

}



soong_config_module_type {

    name: "gralloc_handle_reserved_size",

    module_type: "cc_defaults",

config/BoardConfigQcom.mk

+14 −7
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ ATOLL := atoll #SM6250 
LAHAINA := lahaina #SM8350

HOLI := holi #SM4350

TARO := taro #SM8450

KALAMA := kalama #SM8550



UM_3_18_FAMILY := msm8996

UM_4_4_FAMILY := msm8998
@@ -17,6 +18,7 @@ UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL) 
UM_4_19_FAMILY := $(KONA) $(LITO) $(BENGAL)

UM_5_4_FAMILY := $(LAHAINA) $(HOLI)

UM_5_10_FAMILY := $(TARO)

UM_5_15_FAMILY := $(KALAMA)



ifeq (,$(TARGET_ENFORCES_QSSI))

UM_3_18_FAMILY += msm8937 msm8953
@@ -35,7 +37,8 @@ UM_PLATFORMS := \ 
    $(UM_4_14_FAMILY) \

    $(UM_4_19_FAMILY) \

    $(UM_5_4_FAMILY) \

    $(UM_5_10_FAMILY)

    $(UM_5_10_FAMILY) \

    $(UM_5_15_FAMILY)



LEGACY_UM_PLATFORMS := \

    msm8937 msm8953 msm8996 \
@@ -52,7 +55,8 @@ QSSI_SUPPORTED_PLATFORMS := \ 
    $(UM_4_14_FAMILY) \

    $(UM_4_19_FAMILY) \

    $(UM_5_4_FAMILY) \

    $(UM_5_10_FAMILY)

    $(UM_5_10_FAMILY) \

    $(UM_5_15_FAMILY)



BOARD_USES_ADRENO := true
@@ -97,17 +101,18 @@ TARGET_USES_QCOM_MM_AUDIO := true 
TARGET_USES_COLOR_METADATA := true



# Enable DRM PP driver on UM platforms that support it

ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY) $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY) $(UM_5_10_FAMILY) $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    SOONG_CONFIG_qtidisplay_drmpp := true

    TARGET_USES_DRM_PP := true

endif



# Enable Gralloc4 on UM platforms that support it

ifneq ($(filter $(UM_5_4_FAMILY) $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter $(UM_5_4_FAMILY) $(UM_5_10_FAMILY) $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    SOONG_CONFIG_qtidisplay_gralloc4 := true

endif



ifneq ($(filter $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

# Select AR variant of A-HAL dependencies

ifneq ($(filter $(UM_5_10_FAMILY) $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    TARGET_USES_QCOM_AUDIO_AR ?= true

endif
@@ -125,7 +130,7 @@ TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 13) 
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 21)



# Mark GRALLOC_USAGE_PRIVATE_HEIF_VIDEO as valid gralloc bit on UM platforms that support it

ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY) $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY) $(UM_5_10_FAMILY) $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 27)

endif
@@ -157,6 +162,8 @@ else ifneq ($(filter $(UM_5_4_FAMILY),$(TARGET_BOARD_PLATFORM)),) 
    QCOM_HARDWARE_VARIANT := sm8350

else ifneq ($(filter $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    QCOM_HARDWARE_VARIANT := sm8450

else ifneq ($(filter $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

    QCOM_HARDWARE_VARIANT := sm8550

else

    MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)

    QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
@@ -172,7 +179,7 @@ PRODUCT_SOONG_NAMESPACES += \ 
    vendor/qcom/opensource/commonsys/display \

    vendor/qcom/opensource/commonsys-intf/display



ifeq ($(filter $(UM_5_10_FAMILY),$(TARGET_BOARD_PLATFORM)),)

ifeq ($(filter $(UM_5_10_FAMILY) $(UM_5_15_FAMILY),$(TARGET_BOARD_PLATFORM)),)

PRODUCT_SOONG_NAMESPACES += \

    vendor/qcom/opensource/display

endif

config/BoardConfigSoong.mk

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

    additional_gralloc_10_usage_bits \

    bootloader_message_offset \

    gralloc_handle_has_custom_content_md_reserved_size \

    gralloc_handle_has_reserved_size \

    target_health_charging_control_charging_path \

    target_health_charging_control_charging_enabled \
@@ -63,6 +64,7 @@ SOONG_CONFIG_lineageQcomVars += \ 
endif



# Soong bool variables

SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)

SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)

SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY)

SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
@@ -72,6 +74,7 @@ SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_P 
# Set default values

BOOTLOADER_MESSAGE_OFFSET ?= 0

TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0

TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE ?= false

TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= false

TARGET_HEALTH_CHARGING_CONTROL_CHARGING_ENABLED ?= 1

TARGET_HEALTH_CHARGING_CONTROL_CHARGING_DISABLED ?= 0

prebuilt/common/etc/apns-conf.xml

+31 −31

File changed.

Contains only whitespace changes.