From e741d463e9fa1fa578fd991c100b860d75ce63a7 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Mon, 14 Jun 2021 14:47:33 +0100
Subject: [PATCH] Revert "soong: Add
 TARGET_QTI_USB_SUPPORTS_{AUDIO,DEBUG}_ACCESSORY flags"

This reverts commit ba8e075ed4d7cc079ab2e8a297da28df5ef3b8e7.
It is no longer necessary.

Change-Id: I5d9656ffb686e939f006d5fb1effaba835f93ed2
---
 build/soong/Android.bp     | 22 ----------------------
 config/BoardConfigSoong.mk |  4 ----
 2 files changed, 26 deletions(-)

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 2585ba86..27c22312 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -370,28 +370,6 @@ qti_camera_device {
     },
 }
 
-soong_config_module_type {
-    name: "qti_usb_hal_supported_modes",
-    module_type: "cc_defaults",
-    config_namespace: "lineageQcomVars",
-    bool_variables: ["supports_audio_accessory", "supports_debug_accessory"],
-    properties: [
-        "cppflags",
-    ],
-}
-
-qti_usb_hal_supported_modes {
-    name: "qti_usb_hal_supported_modes_defaults",
-    soong_config_variables: {
-        supports_audio_accessory: {
-            cppflags: ["-DSUPPORTS_AUDIO_ACCESSORY"],
-        },
-        supports_debug_accessory: {
-            cppflags: ["-DSUPPORTS_DEBUG_ACCESSORY"],
-        },
-    },
-}
-
 soong_config_module_type {
     name: "extended_compress_format",
     module_type: "cc_defaults",
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 72939392..1d194a4c 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -49,8 +49,6 @@ SOONG_CONFIG_NAMESPACES += lineageQcomVars
 SOONG_CONFIG_lineageQcomVars += \
     legacy_hw_disk_encryption \
     should_wait_for_qsee \
-    supports_audio_accessory \
-    supports_debug_accessory \
     supports_extended_compress_format \
     supports_hw_fde \
     supports_hw_fde_perf \
@@ -73,8 +71,6 @@ SOONG_CONFIG_lineageGlobalVars_needs_netd_direct_connect_rule := $(TARGET_NEEDS_
 SOONG_CONFIG_lineageNvidiaVars_uses_nv_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
 SOONG_CONFIG_lineageQcomVars_legacy_hw_disk_encryption := $(TARGET_LEGACY_HW_DISK_ENCRYPTION)
 SOONG_CONFIG_lineageQcomVars_should_wait_for_qsee := $(TARGET_KEYMASTER_WAIT_FOR_QSEE)
-SOONG_CONFIG_lineageQcomVars_supports_audio_accessory := $(TARGET_QTI_USB_SUPPORTS_AUDIO_ACCESSORY)
-SOONG_CONFIG_lineageQcomVars_supports_debug_accessory := $(TARGET_QTI_USB_SUPPORTS_DEBUG_ACCESSORY)
 SOONG_CONFIG_lineageQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)
 SOONG_CONFIG_lineageQcomVars_supports_hw_fde := $(TARGET_HW_DISK_ENCRYPTION)
 SOONG_CONFIG_lineageQcomVars_supports_hw_fde_perf := $(TARGET_HW_DISK_ENCRYPTION_PERF)