commit 3c2e4081d84b8fd09fcf3190dce9015755152054
author Ethan Chen <intervigil@gmail.com> Wed Nov 12 12:59:56 2014 -0800
committer Alexander Koskovich <akoskovich@pm.me> Tue Jan 25 07:27:54 2022 -0700
tree 2388d6140ec3b12c643bc6464df7182c4682822d
parent 45f30ed9b52de285b848abd366c9bd6bf5404a83

audio: Use direct project pathmap

Change-Id: If6d270bd92b42df1cdc9719774da768039054753

Android.mk

diff --git a/Android.mk b/Android.mk
index dbb645c..634d7b7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-audio))
+
 ifneq ($(DUAL_AUDIO_FRAMEWORK_AR), true)
 ifneq ($(AUDIO_USE_STUB_HAL), true)
 ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona lahaina holi $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)
@@ -28,3 +30,5 @@
 endif
 endif
 endif
+
+endif

hal/audio_extn/Android.mk

diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 54047c9..cac203f 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -3,7 +3,7 @@
   PRIMARY_HAL_PATH := $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal
   AUDIO_KERNEL_INC := $(TARGET_OUT_INTERMEDIATES)/$(BOARD_OPENSOURCE_DIR)/audio-kernel/include
 else
-  PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
+  PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal
   AUDIO_KERNEL_INC := $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
 endif # BOARD_OPENSOURCE_DIR
 

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 94e8873..0fa21db 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -90,8 +90,8 @@
    LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal \
                        $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal/audio_extn/
 else
-   LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-hal/primary-hal/hal \
-                       vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn/
+   LOCAL_C_INCLUDES += $(call project-path-for,qcom-audio)/hal \
+                       $(call project-path-for,qcom-audio)/hal/audio_extn/
 endif # BOARD_OPENSOURCE_DIR
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
@@ -216,8 +216,8 @@
   LOCAL_C_INCLUDES += $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal \
                       $(BOARD_OPENSOURCE_DIR)/audio-hal/primary-hal/hal/audio_extn
 else
-  LOCAL_C_INCLUDES += vendor/qcom/opensource/audio-hal/primary-hal/hal \
-                      vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn
+  LOCAL_C_INCLUDES += $(call project-path-for,qcom-audio)/hal \
+                      $(call project-path-for,qcom-audio)/hal/audio_extn
 endif # BOARD_OPENSOURCE_DIR
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)