Wifi(Automotive): Strip support of NAN+SAP

Strip support of NAN + SAP

CRs-Fixed: 2710957
Change-Id: I5c877a73d0b5794aee3d4ca45f432f93284cc9f5

msmnile_au/wlan.mk

@@ -42,8 +42,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
 # Pure AOSP: Use pre-defined interface combinations with STA+SAP support
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations

sdmshrike_au/wlan.mk

@@ -42,8 +42,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
 # Pure AOSP: Use pre-defined interface combinations with STA+SAP support
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations

sm6150_au/wlan.mk

@@ -43,8 +43,9 @@ ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WIFI_HIDL_FEATURE_AWARE := true
 else
-# Value-added AOSP: STA + SAP + P2P or NAN
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+# Value-added AOSP: STA + SAP + P2P or STA + P2P/NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P}, 1}},\
+	                               {{{STA}, 1}, {{P2P, NAN}, 1}}
 endif
 
 # Override WLAN configurations