From 4ffd90db941c16346be8fb9fd84c4416ca2abcaf Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 21 Apr 2024 13:47:03 +0000 Subject: [PATCH] Revert "Hookup SDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC" This reverts commit bc8d7739ac4caee7b828477484e3ba4fbf36652b. Reason for revert: no longer needed when using blobs that match tag DISPLAY.LA.3.0.r1-10700-KAILUA.0. Change-Id: Ia89ce566a4cade6091a2dc6bc4e8b56ef7d1f73b --- build/soong/Android.bp | 17 ----------------- config/BoardConfigSoong.mk | 3 --- 2 files changed, 20 deletions(-) diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 47e5f0b2..4ceb0326 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -132,23 +132,6 @@ gralloc_handle_custom_content_md_reserved_size { }, } -soong_config_module_type { - name: "sdmcore_has_is_display_hw_available", - module_type: "cc_defaults", - config_namespace: "lineageGlobalVars", - bool_variables: ["sdmcore_has_is_display_hw_available_func"], - properties: ["cflags"], -} - -sdmcore_has_is_display_hw_available { - name: "sdmcore_has_is_display_hw_available_func_defaults", - soong_config_variables: { - sdmcore_has_is_display_hw_available_func: { - cflags: ["-DSDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC"], - }, - }, -} - soong_config_module_type { name: "gralloc_handle_reserved_size", module_type: "cc_defaults", diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk index 28fad134..fc351cda 100644 --- a/config/BoardConfigSoong.mk +++ b/config/BoardConfigSoong.mk @@ -34,7 +34,6 @@ SOONG_CONFIG_lineageGlobalVars += \ camera_override_format_from_reserved \ gralloc_handle_has_custom_content_md_reserved_size \ gralloc_handle_has_reserved_size \ - sdmcore_has_is_display_hw_available_func \ target_health_charging_control_charging_path \ target_health_charging_control_charging_enabled \ target_health_charging_control_charging_disabled \ @@ -71,7 +70,6 @@ endif SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED) 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_sdmcore_has_is_display_hw_available_func := $(TARGET_SDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC) SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT) SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY) SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS) @@ -93,7 +91,6 @@ TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE ?= false TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE ?= true TARGET_INIT_VENDOR_LIB ?= vendor_init TARGET_QTI_VIBRATOR_EFFECT_LIB ?= libqtivibratoreffect -TARGET_SDMCORE_HAS_IS_DISPLAY_HW_AVAILABLE_FUNC ?= true TARGET_SURFACEFLINGER_UDFPS_LIB ?= surfaceflinger_udfps_lib TARGET_TRUST_USB_CONTROL_PATH ?= /proc/sys/kernel/deny_new_usb TARGET_TRUST_USB_CONTROL_ENABLE ?= 1