From 89fd58c860714648ec2bbcfdd29f1f5915fbf58b Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Tue, 30 Aug 2022 02:39:47 +0300
Subject: [PATCH] config: Remove TARGET_USES_QCOM_BSP_LEGACY

Change-Id: I93f111285c46e1a1f811b9d8555de96474d60386
---
 build/soong/Android.bp     | 17 -----------------
 config/BoardConfigQcom.mk  |  1 -
 config/BoardConfigSoong.mk |  4 +---
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 377db4a8..f9b2f8cf 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -426,20 +426,3 @@ surfaceflinger_qcom_extensions {
         },
     },
 }
-
-soong_config_module_type {
-    name: "stagefright_qcom_legacy",
-    module_type: "cc_defaults",
-    config_namespace: "lineageQcomVars",
-    bool_variables: ["uses_qcom_bsp_legacy"],
-    properties: ["cppflags"],
-}
-
-stagefright_qcom_legacy {
-    name: "stagefright_qcom_legacy_defaults",
-    soong_config_variables: {
-        uses_qcom_bsp_legacy: {
-            cppflags: ["-DQCOM_BSP_LEGACY"],
-        },
-    },
-}
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 75368396..da90a825 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -58,7 +58,6 @@ endif
 TARGET_COMPILE_WITH_MSM_KERNEL := true
 
 ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),)
-    TARGET_USES_QCOM_BSP_LEGACY := true
     # Enable legacy audio functions
     ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
         USE_CUSTOM_AUDIO_POLICY := 1
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 5c942c66..5fb282f0 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -53,8 +53,7 @@ SOONG_CONFIG_lineageNvidiaVars += \
 SOONG_CONFIG_NAMESPACES += lineageQcomVars
 SOONG_CONFIG_lineageQcomVars += \
     supports_extended_compress_format \
-    uses_pre_uplink_features_netmgrd \
-    uses_qcom_bsp_legacy
+    uses_pre_uplink_features_netmgrd
 
 # Only create display_headers_namespace var if dealing with UM platforms to avoid breaking build for all other platforms
 ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
@@ -73,7 +72,6 @@ SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPL
 SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
 SOONG_CONFIG_lineageQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)
 SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_PRE_UPLINK_FEATURES_NETMGRD)
-SOONG_CONFIG_lineageQcomVars_uses_qcom_bsp_legacy := $(TARGET_USES_QCOM_BSP_LEGACY)
 
 # Set default values
 BOOTLOADER_MESSAGE_OFFSET ?= 0