Skip to content

GitLab

Commit 5321b366 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Prepare to move system/media 

Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4
parent cde9b8b8
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
src/Android.mk
View file @ 5321b366
......@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := \
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 $(BUILD_STATIC_LIBRARY)
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 @@ EXCLUDE_SRC := \
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
......@@ -199,7 +199,7 @@ include $(BUILD_SHARED_LIBRARY)
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
......@@ -214,7 +214,7 @@ include $(BUILD_SHARED_LIBRARY)
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
......
tests/Android.mk
View file @ 5321b366
......@@ -18,7 +18,7 @@ c_includes := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
system/media/wilhelm/include \
$(call include-path-for, wilhelm) \
external/stlport/stlport
module_tags := tests
......
tests/automated/Android.mk
View file @ 5321b366
......@@ -8,9 +8,9 @@ LOCAL_C_INCLUDES:= \
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
......
tests/examples/Android.mk
View file @ 5321b366
......@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
system/media/wilhelm/include
$(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
xaVideoDecoderCapabilities.cpp
......
tests/listening/Android.mk
View file @ 5321b366
......@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
system/media/wilhelm/include
$(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTest_playMuteSolo.cpp
......
tests/mimeUri/Android.mk
View file @ 5321b366
......@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
system/media/wilhelm/include
$(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestGetPositionUri.cpp
......
tests/native-media/jni/Android.mk
View file @ 5321b366
......@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
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
......
tests/sandbox/Android.mk
View file @ 5321b366
......@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
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 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
system/media/wilhelm/include
$(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
xaplay.c nativewindow.cpp
......
tests/sandbox/streamSource/Android.mk
View file @ 5321b366
......@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES:= \
system/media/wilhelm/include
$(call include-path-for, wilhelm)
LOCAL_SRC_FILES:= \
slesTestPlayStream.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment