diff --git a/ipc/HwBinders/agm_ipc_service/Android.mk b/ipc/HwBinders/agm_ipc_service/Android.mk
index f9a9a1a..596e4ae 100644
--- a/ipc/HwBinders/agm_ipc_service/Android.mk
+++ b/ipc/HwBinders/agm_ipc_service/Android.mk
@@ -9,6 +9,8 @@
 LOCAL_C_INCLUDES    := $(TOP)/vendor/qcom/opensource/agm/ipc/HwBinders/agm_ipc_client/
 LOCAL_SRC_FILES     := src/agm_server_wrapper.cpp
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+
 LOCAL_SHARED_LIBRARIES := \
     libhidlbase \
     libutils \
@@ -22,6 +24,7 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+ifneq ($(strip $(AUDIO_FEATURE_ENABLED_AGM_HIDL)),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE               := vendor.qti.hardware.AGMIPC@1.0-service
@@ -46,3 +49,4 @@
     libagm
 
 include $(BUILD_EXECUTABLE)
+endif