commit 7e609c2fb77aacd45a6033a35a29b07d2b57f5df
author Linux Build Service Account <lnxbuild@localhost> Tue May 17 14:29:28 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue May 17 14:29:28 2022 -0700
tree 19b20196adc49108d52a13f509c11a91c4c49adb
parent bf0206a5e596ab221d479e2ba03835c6c7746e9e
parent 173e79e6caef197fea7c57655dfac38fa12019de

Merge 173e79e6caef197fea7c57655dfac38fa12019de on remote branch

Change-Id: Ia2f23b98f5336169c32f66baf21b806cb1d83333

Android.mk

diff --git a/Android.mk b/Android.mk
index 5d03591..7cd7d6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,12 @@
 LOCAL_PATH := $(call my-dir)
+
+QMAA_DISABLES_WFD := false
+ifeq ($(TARGET_USES_QMAA),true)
+ifneq ($(TARGET_USES_QMAA_OVERRIDE_WFD),true)
+QMAA_DISABLES_WFD := true
+endif #TARGET_USES_QMAA_OVERRIDE_WFD
+endif #TARGET_USES_QMAA
+
 WFD_DISABLE_PLATFORM_LIST := neo anorak
 
 #Disable WFD for selected 32-bit targets
@@ -10,6 +18,8 @@
 
 ifneq ($(call is-board-platform-in-list,$(WFD_DISABLE_PLATFORM_LIST)),true)
 ifneq ($(TARGET_HAS_LOW_RAM), true)
+ifneq ($(QMAA_DISABLES_WFD),true)
 include $(call all-makefiles-under, $(LOCAL_PATH))
-endif
-endif
+endif #QMAA_DISABLES_WFD
+endif #TARGET_HAS_LOW_RAM
+endif #WFD_DISABLE_PLATFORM_LIST