From ffd3d95879ddb51743d74e4b361d8d68d9b44d99 Mon Sep 17 00:00:00 2001 From: alk3pInjection Date: Wed, 19 Jan 2022 17:42:15 +0800 Subject: Revert "audio: Use direct project pathmap" This reverts commit 232eb824d33a0cb1b5d2f83d4238d4dd0b009f69. Change-Id: I92a4e6fd19435d95698658d4559470096d7a6466 --- Android.mk | 4 ---- hal/audio_extn/Android.mk | 43 ++++++++++++++++++++----------------------- post_proc/Android.mk | 8 ++++---- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/Android.mk b/Android.mk index ae4a5e10..0bf32b71 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(call my-dir),$(call project-path-for,qcom-audio)) - 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,5 +26,3 @@ endif endif endif - -endif diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk index ae0c6ca4..1d937256 100644 --- a/hal/audio_extn/Android.mk +++ b/hal/audio_extn/Android.mk @@ -38,7 +38,7 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - $(call project-path-for,qcom-audio)/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ $(call include-path-for, audio-effects) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -100,8 +100,8 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - $(call project-path-for,qcom-audio)/hal \ - $(call project-path-for,qcom-audio)/hal/$(AUDIO_PLATFORM) \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ $(call include-path-for, audio-effects) LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include @@ -130,7 +130,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libssrec LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -164,8 +163,8 @@ LOCAL_SHARED_LIBRARIES := \ libprocessgroup LOCAL_C_INCLUDES := \ - $(PRIMARY_HAL_PATH) \ - $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ external/tinyalsa/include \ external/tinycompress/include \ external/expat/lib \ @@ -201,7 +200,7 @@ LOCAL_MODULE := libhdmiedid LOCAL_MODULE_OWNER := third_party LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -260,7 +259,6 @@ include $(BUILD_SHARED_LIBRARY) #-------------------------------------------- include $(CLEAR_VARS) -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) # B-family platform uses msm8974 code base AUDIO_PLATFORM := msm8974 @@ -297,9 +295,9 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - $(PRIMARY_HAL_PATH) \ - $(PRIMARY_HAL_PATH)/audio_extn \ - $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ vendor/qcom/opensource/audio-kernel/include/uapi/ \ $(call include-path-for, audio-effects) @@ -320,7 +318,6 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) # B-family platform uses msm8974 code base AUDIO_PLATFORM := msm8974 @@ -357,9 +354,9 @@ LOCAL_C_INCLUDES := \ system/media/audio_utils/include \ external/expat/lib \ $(call include-path-for, audio-route) \ - $(PRIMARY_HAL_PATH) \ - $(PRIMARY_HAL_PATH)/audio_extn \ - $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \ vendor/qcom/opensource/audio-kernel/include/uapi/ \ $(call include-path-for, audio-effects) @@ -383,7 +380,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := liba2dpoffload LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -448,7 +445,7 @@ LOCAL_MODULE := libexthwplugin LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -511,7 +508,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhfp LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -581,7 +578,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhdmipassthru LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -655,7 +652,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libbatterylistener LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -728,7 +725,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhwdepcal LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi lito bengal atoll sdm660 msm8937 msm8953 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -791,7 +788,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libmaxxaudio LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) @@ -853,7 +850,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libaudiozoom LOCAL_VENDOR_MODULE := true -PRIMARY_HAL_PATH := $(call project-path-for,qcom-audio)/hal +PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina holi sdm660 msm8937 msm8953 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),) diff --git a/post_proc/Android.mk b/post_proc/Android.mk index 862b81b1..774198d8 100644 --- a/post_proc/Android.mk +++ b/post_proc/Android.mk @@ -82,12 +82,12 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES := \ external/tinyalsa/include \ - $(call project-path-for,qcom-audio)/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ $(call include-path-for, audio-effects) \ - $(call project-path-for,qcom-audio)/hal/audio_extn/ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn/ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true) LOCAL_HEADER_LIBRARIES += audio_kernel_headers @@ -195,14 +195,14 @@ LOCAL_MODULE_OWNER := qti LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES := \ - $(call project-path-for,qcom-audio)/hal \ + vendor/qcom/opensource/audio-hal/primary-hal/hal \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include \ external/tinyalsa/include \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-route) \ - $(call project-path-for,qcom-audio)/hal/audio_extn \ + vendor/qcom/opensource/audio-hal/primary-hal/hal/audio_extn \ external/tinycompress/include \ system/media/audio_utils/include -- cgit v1.2.3