diff options
| author | 2012-03-15 07:53:54 -0700 | |
|---|---|---|
| committer | 2012-03-15 07:53:54 -0700 | |
| commit | 4513bc0f28d210a970166f6ce35c3bbab1e49522 (patch) | |
| tree | 40d47971e1f39f65ddf41d88ebce2fad5c198859 | |
| parent | 5571ffdd9d419e3b1e050501e6f8dbfb04159b5d (diff) | |
| parent | 4e42c5f41fdb67ec62fbecc48038c8fe30b57bcd (diff) | |
Merge "Remove dependency on audio_* location"
| -rw-r--r-- | media/jni/audioeffect/Android.mk | 2 | ||||
| -rw-r--r-- | media/libeffects/downmix/Android.mk | 4 | ||||
| -rw-r--r-- | media/libeffects/factory/Android.mk | 2 | ||||
| -rw-r--r-- | media/libeffects/lvm/wrapper/Android.mk | 6 | ||||
| -rwxr-xr-x | media/libeffects/preprocessing/Android.mk | 2 | ||||
| -rw-r--r-- | media/libeffects/testlibs/Android.mk_ | 4 | ||||
| -rw-r--r-- | media/libeffects/visualizer/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmedia/Android.mk | 4 | ||||
| -rw-r--r-- | services/audioflinger/Android.mk | 4 | ||||
| -rw-r--r-- | voip/jni/rtp/Android.mk | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index 3e493b1a03ea..b5d8b7b21a46 100644 --- a/media/jni/audioeffect/Android.mk +++ b/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 diff --git a/media/libeffects/downmix/Android.mk b/media/libeffects/downmix/Android.mk index 0348e1e9f077..95ca6fd11c9d 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 2f2b974773d0..6e69151a4087 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 f097dd084ecf..4313424a1426 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 7f7c7e1ee892..c13b9d4141f5 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 249ebf417cb7..2954908806ae 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 2160177e1ce3..76b5110b7e5d 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 5ecc8f508efa..8b009aa2383f 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 86692e7e1fb9..5164213b6fbc 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 \ diff --git a/voip/jni/rtp/Android.mk b/voip/jni/rtp/Android.mk index 08152942c66c..49b711d4b84e 100644 --- a/voip/jni/rtp/Android.mk +++ b/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 |