primary-hal: Update paths to agm and pal
Change-Id: I4d8c44ad312c0ec892ffbd4d878bef775706c11c
diff --git a/audio-effects/post_proc/Android.mk b/audio-effects/post_proc/Android.mk
index ec4fafd..6dcf90e 100644
--- a/audio-effects/post_proc/Android.mk
+++ b/audio-effects/post_proc/Android.mk
@@ -87,7 +87,7 @@
LOCAL_C_INCLUDES := \
$(call project-path-for,qcom-audio)/primary-hal/hal \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \
$(call include-path-for, audio-effects) \
@@ -195,7 +195,7 @@
LOCAL_C_INCLUDES := \
$(call project-path-for,qcom-audio)/primary-hal/hal \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \
diff --git a/audio-effects/visualizer/Android.mk b/audio-effects/visualizer/Android.mk
index 301cde0..007c086 100644
--- a/audio-effects/visualizer/Android.mk
+++ b/audio-effects/visualizer/Android.mk
@@ -54,7 +54,7 @@
LOCAL_VENDOR_MODULE := true
LOCAL_C_INCLUDES := \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(call include-path-for, audio-effects)
LOCAL_CFLAGS += -Wno-unused-variable
diff --git a/configs/kalama/kalama.mk b/configs/kalama/kalama.mk
index af49adb..c4f7862 100644
--- a/configs/kalama/kalama.mk
+++ b/configs/kalama/kalama.mk
@@ -121,7 +121,7 @@
QCV_FAMILY_SKUS := kalama
DEVICE_SKU := kalama
-CONFIG_PAL_SRC_DIR := vendor/qcom/opensource/pal/configs/kalama
+CONFIG_PAL_SRC_DIR := hardware/qcom-caf/sm8550/audio/pal/configs/kalama
CONFIG_HAL_SRC_DIR := $(AUDIO_HAL_DIR)/configs/kalama
CONFIG_SKU_OUT_DIR := $(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)
diff --git a/hal/Android.mk b/hal/Android.mk
index 26d4189..6a0fd0f 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -54,12 +54,12 @@
system/media/audio_utils/include \
external/expat/lib \
vendor/qcom/opensource/core-utils/fwk-detect \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(call include-path-for, audio-effects) \
$(LOCAL_PATH)/audio_extn \
- $(TOP)/vendor/qcom/opensource/agm/ipc/HwBinders/agm_ipc_client/ \
- $(TOP)/vendor/qcom/opensource/agm/ipc/HwBinders/agm_ipc_service/inc/ \
- $(TOP)/vendor/qcom/opensource/pal/ipc/HwBinders/pal_ipc_server/inc/
+ $(call project-path-for,qcom-audio)/agm/ipc/HwBinders/agm_ipc_client/ \
+ $(call project-path-for,qcom-audio)/agm/ipc/HwBinders/agm_ipc_service/inc/ \
+ $(call project-path-for,qcom-audio)/pal/ipc/HwBinders/pal_ipc_server/inc/
LOCAL_SRC_FILES := \
AudioStream.cpp \
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index a1fc411..62e5796 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -30,7 +30,7 @@
libar-pal
LOCAL_C_INCLUDES := \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(call project-path-for,qcom-audio)/primary-hal/hal \
$(call project-path-for,qcom-audio)/primary-hal/hal/audio_extn \
external/expat/lib \
@@ -68,7 +68,7 @@
libar-pal
LOCAL_C_INCLUDES := \
- vendor/qcom/opensource/pal \
+ $(call project-path-for,qcom-audio)/pal \
$(call project-path-for,qcom-audio)/primary-hal/hal \
$(call project-path-for,qcom-audio)/primary-hal/hal/audio_extn \
external/expat/lib \