Merge "Prepare to move system/media"
diff --git a/src/Android.mk b/src/Android.mk
index 037f928..c0ced44 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -8,7 +8,7 @@
ut/slesutResult.c
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_CFLAGS += -fvisibility=hidden -UNDEBUG
@@ -19,7 +19,7 @@
include $(CLEAR_VARS)
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_CFLAGS += -Wno-override-init
# -Wno-missing-field-initializers
@@ -159,11 +159,11 @@
itf/IVisualization.c
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
+ $(call include-path-for, wilhelm) \
frameworks/base/media/libstagefright \
frameworks/base/media/libstagefright/include \
frameworks/native/include/media/openmax \
- system/media/audio_effects/include
+ $(call include-path-for, audio-effects)
# __pthread_gettid
LOCAL_C_INCLUDES += bionic/libc/private
@@ -200,7 +200,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := sl_entry.c sl_iid.c assert.c
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
+ $(call include-path-for, wilhelm) \
frameworks/base/media/libstagefright \
frameworks/base/media/libstagefright/include \
frameworks/native/include/media/openmax
@@ -215,7 +215,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := xa_entry.c xa_iid.c assert.c
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
+ $(call include-path-for, wilhelm) \
frameworks/base/media/libstagefright \
frameworks/base/media/libstagefright/include \
frameworks/native/include/media/openmax
diff --git a/tests/Android.mk b/tests/Android.mk
index 9580245..9818656 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,7 @@
bionic \
bionic/libstdc++/include \
external/gtest/include \
- system/media/wilhelm/include \
+ $(call include-path-for, wilhelm) \
external/stlport/stlport
module_tags := tests
diff --git a/tests/automated/Android.mk b/tests/automated/Android.mk
index fcb9eeb..76a2401 100644
--- a/tests/automated/Android.mk
+++ b/tests/automated/Android.mk
@@ -8,9 +8,9 @@
bionic \
bionic/libstdc++/include \
external/gtest/include \
- system/media/wilhelm/include \
+ $(call include-path-for, wilhelm) \
external/stlport/stlport \
- system/media/wilhelm/src/ut
+ $(call include-path-for, wilhelm-ut)
LOCAL_SRC_FILES:= \
BufferQueue_test.cpp
diff --git a/tests/examples/Android.mk b/tests/examples/Android.mk
index f9e912e..d16164e 100644
--- a/tests/examples/Android.mk
+++ b/tests/examples/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestRecBuffQueue.cpp
@@ -31,7 +31,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayFdPath.cpp
@@ -55,7 +55,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestFeedback.cpp
@@ -82,7 +82,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestSawtoothBufferQueue.cpp
@@ -107,7 +107,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestEqFdPath.cpp
@@ -131,7 +131,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestEqOutputPath.cpp
@@ -155,7 +155,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestBassBoostPath.cpp
@@ -179,7 +179,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestVirtualizerPath.cpp
@@ -203,7 +203,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestEffectCapabilities.cpp
@@ -227,7 +227,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestSendToPresetReverb.cpp
@@ -251,7 +251,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestDecodeToBuffQueue.cpp
@@ -276,7 +276,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestDecodeAac.cpp
@@ -307,7 +307,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
xaVideoDecoderCapabilities.cpp
diff --git a/tests/listening/Android.mk b/tests/listening/Android.mk
index 89d838a..8b165d1 100644
--- a/tests/listening/Android.mk
+++ b/tests/listening/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
seekTorture.c
@@ -31,7 +31,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTest_playMuteSolo.cpp
diff --git a/tests/mimeUri/Android.mk b/tests/mimeUri/Android.mk
index 04742ba..ac2ed88 100644
--- a/tests/mimeUri/Android.mk
+++ b/tests/mimeUri/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTest_playStates.cpp
@@ -33,7 +33,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayStreamType.cpp
@@ -59,7 +59,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayUri.cpp
@@ -85,7 +85,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestLoopUri.cpp
@@ -111,7 +111,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayUri2.cpp
@@ -137,7 +137,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestSlowDownUri.cpp
@@ -163,7 +163,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestManyPlayers.cpp
@@ -189,7 +189,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestGetPositionUri.cpp
diff --git a/tests/native-media/jni/Android.mk b/tests/native-media/jni/Android.mk
index 4d111ac..ad5e806 100644
--- a/tests/native-media/jni/Android.mk
+++ b/tests/native-media/jni/Android.mk
@@ -5,7 +5,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := libnative-media-jni
LOCAL_SRC_FILES := native-media-jni.c
-LOCAL_CFLAGS += -Isystem/media/wilhelm/include
+LOCAL_CFLAGS += -I$(call include-path-for, wilhelm)
LOCAL_CFLAGS += -UNDEBUG
LOCAL_PRELINK_MODULE := false
diff --git a/tests/sandbox/Android.mk b/tests/sandbox/Android.mk
index 53c4fd0..4f39385 100644
--- a/tests/sandbox/Android.mk
+++ b/tests/sandbox/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
intbufq.c \
@@ -35,7 +35,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
multiplay.c
@@ -61,8 +61,8 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
- system/media/wilhelm/src/ut
+ $(call include-path-for, wilhelm) \
+ $(call include-path-for, wilhelm-ut)
LOCAL_SRC_FILES:= \
engine.c
@@ -91,8 +91,8 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
- system/media/wilhelm/src/ut
+ $(call include-path-for, wilhelm) \
+ $(call include-path-for, wilhelm-ut)
LOCAL_SRC_FILES:= \
object.c
@@ -121,7 +121,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
configbq.c
@@ -147,7 +147,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
reverb.c
@@ -176,7 +176,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
srcsink.c
@@ -205,8 +205,8 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include \
- system/media/wilhelm/src/ut
+ $(call include-path-for, wilhelm) \
+ $(call include-path-for, wilhelm-ut)
LOCAL_SRC_FILES:= \
outputmix.c
@@ -235,7 +235,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
urimime.c
@@ -264,7 +264,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
dim.c
@@ -293,7 +293,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
multithread.c
@@ -322,7 +322,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
playbq.c
@@ -353,7 +353,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
monkey.c
@@ -382,7 +382,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
xa.c
@@ -411,7 +411,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
dual.c
@@ -441,7 +441,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
xaplay.c nativewindow.cpp
diff --git a/tests/sandbox/streamSource/Android.mk b/tests/sandbox/streamSource/Android.mk
index b5fdd10..bdaccc6 100644
--- a/tests/sandbox/streamSource/Android.mk
+++ b/tests/sandbox/streamSource/Android.mk
@@ -7,7 +7,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
- system/media/wilhelm/include
+ $(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayStream.cpp
