From 33b383948e8f270bff30378476f00dce289004eb Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 13 Mar 2012 15:59:35 -0700 Subject: Remove dependency on audio_* location Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8 --- media/libeffects/downmix/Android.mk | 4 ++-- media/libeffects/factory/Android.mk | 2 +- media/libeffects/lvm/wrapper/Android.mk | 6 +++--- media/libeffects/preprocessing/Android.mk | 2 +- media/libeffects/testlibs/Android.mk_ | 4 ++-- media/libeffects/visualizer/Android.mk | 2 +- media/libmedia/Android.mk | 4 ++-- services/audioflinger/Android.mk | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/media/libeffects/downmix/Android.mk b/media/libeffects/downmix/Android.mk index 0348e1e..95ca6fd 100644 --- a/media/libeffects/downmix/Android.mk +++ b/media/libeffects/downmix/Android.mk @@ -20,8 +20,8 @@ LOCAL_LDLIBS += -ldl endif LOCAL_C_INCLUDES := \ - system/media/audio_effects/include \ - system/media/audio_utils/include + $(call include-path-for, audio-effects) \ + $(call include-path-for, audio-utils) LOCAL_PRELINK_MODULE := false diff --git a/media/libeffects/factory/Android.mk b/media/libeffects/factory/Android.mk index 2f2b974..6e69151 100644 --- a/media/libeffects/factory/Android.mk +++ b/media/libeffects/factory/Android.mk @@ -15,6 +15,6 @@ LOCAL_MODULE:= libeffects LOCAL_SHARED_LIBRARIES += libdl LOCAL_C_INCLUDES := \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk index f097dd0..4313424 100644 --- a/media/libeffects/lvm/wrapper/Android.mk +++ b/media/libeffects/lvm/wrapper/Android.mk @@ -26,7 +26,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Bundle \ $(LOCAL_PATH)/../lib/Common/lib/ \ $(LOCAL_PATH)/../lib/Bundle/lib/ \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) include $(BUILD_SHARED_LIBRARY) @@ -55,6 +55,6 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Reverb \ $(LOCAL_PATH)/../lib/Common/lib/ \ $(LOCAL_PATH)/../lib/Reverb/lib/ \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/preprocessing/Android.mk b/media/libeffects/preprocessing/Android.mk index 7f7c7e1..c13b9d4 100755 --- a/media/libeffects/preprocessing/Android.mk +++ b/media/libeffects/preprocessing/Android.mk @@ -14,7 +14,7 @@ LOCAL_C_INCLUDES += \ external/webrtc/src \ external/webrtc/src/modules/interface \ external/webrtc/src/modules/audio_processing/interface \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) LOCAL_C_INCLUDES += $(call include-path-for, speex) diff --git a/media/libeffects/testlibs/Android.mk_ b/media/libeffects/testlibs/Android.mk_ index 249ebf4..2954908 100644 --- a/media/libeffects/testlibs/Android.mk_ +++ b/media/libeffects/testlibs/Android.mk_ @@ -23,7 +23,7 @@ LOCAL_SHARED_LIBRARIES += libdl endif LOCAL_C_INCLUDES := \ - system/media/audio_effects/include \ + $(call include-path-for, audio-effects) \ $(call include-path-for, graphics corecg) LOCAL_MODULE_TAGS := optional @@ -60,7 +60,7 @@ endif LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) LOCAL_MODULE_TAGS := optional diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk index 2160177..76b5110 100644 --- a/media/libeffects/visualizer/Android.mk +++ b/media/libeffects/visualizer/Android.mk @@ -17,7 +17,7 @@ LOCAL_MODULE:= libvisualizer LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ - system/media/audio_effects/include + $(call include-path-for, audio-effects) include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 5ecc8f5..8b009aa 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -60,7 +60,7 @@ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax \ external/icu4c/common \ external/expat/lib \ - system/media/audio_effects/include \ - system/media/audio_utils/include + $(call include-path-for, audio-effects) \ + $(call include-path-for, audio-utils) include $(BUILD_SHARED_LIBRARY) diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 86692e7..5164213 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -12,8 +12,8 @@ LOCAL_SRC_FILES:= \ # AudioResamplerCubic.cpp.arm LOCAL_C_INCLUDES := \ - system/media/audio_effects/include \ - system/media/audio_utils/include + $(call include-path-for, audio-effects) \ + $(call include-path-for, audio-utils) LOCAL_SHARED_LIBRARIES := \ libaudioutils \ -- cgit v1.1