From a117e055af56b716b1403ea6de0f860cb740f65c Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 4 May 2018 15:41:10 -0700 Subject: [PATCH] Remove obsolete include path from makefiles frameworks/av/services/audiopolicy/utilities does not exist, remove it from audio service components' makefiles. Test: build Change-Id: I6c29052b449099d4b0942b7fc0a7ae68d0dc1ba7 Merged-In: I6c29052b449099d4b0942b7fc0a7ae68d0dc1ba7 --- services/audiopolicy/Android.mk | 2 -- services/audiopolicy/common/managerdefinitions/Android.mk | 3 +-- services/audiopolicy/engineconfigurable/wrapper/Android.mk | 1 - services/audiopolicy/tests/Android.mk | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk index 4c90bb59ed..c281b068ea 100644 --- a/services/audiopolicy/Android.mk +++ b/services/audiopolicy/Android.mk @@ -13,7 +13,6 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-utils) \ frameworks/av/services/audiopolicy/common/include \ frameworks/av/services/audiopolicy/engine/interface \ - frameworks/av/services/audiopolicy/utilities LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -74,7 +73,6 @@ endif # ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1) LOCAL_C_INCLUDES += \ frameworks/av/services/audiopolicy/common/include \ frameworks/av/services/audiopolicy/engine/interface \ - frameworks/av/services/audiopolicy/utilities LOCAL_STATIC_LIBRARIES := \ libaudiopolicycomponents diff --git a/services/audiopolicy/common/managerdefinitions/Android.mk b/services/audiopolicy/common/managerdefinitions/Android.mk index 424c5cc367..77331c2fb2 100644 --- a/services/audiopolicy/common/managerdefinitions/Android.mk +++ b/services/audiopolicy/common/managerdefinitions/Android.mk @@ -35,8 +35,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ frameworks/av/services/audiopolicy/common/include \ frameworks/av/services/audiopolicy \ - frameworks/av/services/audiopolicy/utilities \ - system/media/audio_utils/include \ + $(call include-path-for, audio-utils) \ ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) diff --git a/services/audiopolicy/engineconfigurable/wrapper/Android.mk b/services/audiopolicy/engineconfigurable/wrapper/Android.mk index 36e0f429b7..b128a38098 100644 --- a/services/audiopolicy/engineconfigurable/wrapper/Android.mk +++ b/services/audiopolicy/engineconfigurable/wrapper/Android.mk @@ -10,7 +10,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ frameworks/av/services/audiopolicy/engineconfigurable/include \ frameworks/av/services/audiopolicy/engineconfigurable/interface \ - frameworks/av/services/audiopolicy/utilities/convert \ LOCAL_SRC_FILES:= ParameterManagerWrapper.cpp diff --git a/services/audiopolicy/tests/Android.mk b/services/audiopolicy/tests/Android.mk index a43daea3a7..cfa9ab1141 100644 --- a/services/audiopolicy/tests/Android.mk +++ b/services/audiopolicy/tests/Android.mk @@ -6,7 +6,6 @@ LOCAL_C_INCLUDES := \ frameworks/av/services/audiopolicy \ frameworks/av/services/audiopolicy/common/include \ frameworks/av/services/audiopolicy/engine/interface \ - frameworks/av/services/audiopolicy/utilities LOCAL_SHARED_LIBRARIES := \ libaudiopolicymanagerdefault \