Merge "Remove dependency on audio_* location"

Author: gkasten

media/jni/audioeffect/Android.mk

@@ -13,7 +13,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libmedia
 
 LOCAL_C_INCLUDES := \
-	system/media/audio_effects/include
+	$(call include-path-for, audio-effects)
 
 LOCAL_MODULE:= libaudioeffect_jni
 

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
 

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)

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)
+include $(BUILD_SHARED_LIBRARY)

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)
 

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
 

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)

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)

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 \

voip/jni/rtp/Android.mk

@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES += \
 	frameworks/base/media/libstagefright/codecs/amrnb/enc/src \
 	frameworks/base/media/libstagefright/codecs/amrnb/dec/include \
 	frameworks/base/media/libstagefright/codecs/amrnb/dec/src \
-	system/media/audio_effects/include
+	$(call include-path-for, audio-effects)
 
 LOCAL_CFLAGS += -fvisibility=hidden