commit 3323fdbba036c7db0610f610e387af63e4eff317
author Linux Build Service Account <lnxbuild@localhost> Mon Aug 29 10:55:12 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 29 10:55:12 2016 -0700
tree 97727ab0eebea4682c2690c887dbac611fb5edb1
parent c67f58b716c9f188dcc452428ed71f326aa61b18
parent 710f353ebc5cbf9dcc205ddb97c3c25d2a0ba9a3

Merge "hal: enable compilation of sound trigger extn, based on new ST HAL" into audio-userspace.lnx.2.1-dev

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index adee78b..7f42432 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -285,6 +285,14 @@
 endif
 
 ifeq ($(strip $(BOARD_SUPPORTS_SOUND_TRIGGER)),true)
+    ST_FEATURE_ENABLE := true
+endif
+
+ifeq ($(strip $(BOARD_SUPPORTS_SOUND_TRIGGER_HAL)),true)
+    ST_FEATURE_ENABLE := true
+endif
+
+ifeq ($(ST_FEATURE_ENABLE), true)
     LOCAL_CFLAGS += -DSOUND_TRIGGER_ENABLED
     LOCAL_CFLAGS += -DSOUND_TRIGGER_PLATFORM_NAME=$(TARGET_BOARD_PLATFORM)
     LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/sound_trigger