summaryrefslogtreecommitdiffstats
path: root/media/libeffects
diff options
context:
space:
mode:
authorTrevor Drake <trevordrake.gerrit@gmail.com>2014-12-11 19:25:38 +0000
committerTrevor Drake <trevordrake.gerrit@gmail.com>2014-12-11 19:25:38 +0000
commitb092a173cf139c0f03bd2fcf3e6e78cce515211d (patch)
treeca1090e9ebaf64d2a1d902d2c1b905ed2a0a7e95 /media/libeffects
parentcf1e3bb24b88cf942c133248d26ee7bb57ed5ba7 (diff)
downloadframeworks_av-b092a173cf139c0f03bd2fcf3e6e78cce515211d.zip
frameworks_av-b092a173cf139c0f03bd2fcf3e6e78cce515211d.tar.gz
frameworks_av-b092a173cf139c0f03bd2fcf3e6e78cce515211d.tar.bz2
Remove obsolete TARGET_SIMULATOR checks
Change-Id: I9d499190e49fed16aac686ae5da79ab870605ff4
Diffstat (limited to 'media/libeffects')
-rw-r--r--media/libeffects/testlibs/Android.mk_35
1 files changed, 11 insertions, 24 deletions
diff --git a/media/libeffects/testlibs/Android.mk_ b/media/libeffects/testlibs/Android.mk_
index 672ebba..14c373f 100644
--- a/media/libeffects/testlibs/Android.mk_
+++ b/media/libeffects/testlibs/Android.mk_
@@ -3,24 +3,18 @@ LOCAL_PATH:= $(call my-dir)
# Test Reverb library
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
+LOCAL_SRC_FILES := \
EffectReverb.c.arm \
EffectsMath.c.arm
-LOCAL_CFLAGS+= -O2
+
+LOCAL_CFLAGS := -O2
LOCAL_SHARED_LIBRARIES := \
- libcutils
+ libcutils \
+ libdl
LOCAL_MODULE_RELATIVE_PATH := soundfx
-LOCAL_MODULE:= libreverbtest
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_MODULE := libreverbtest
LOCAL_C_INCLUDES := \
$(call include-path-for, audio-effects) \
@@ -33,7 +27,7 @@ include $(BUILD_SHARED_LIBRARY)
# Test Equalizer library
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
+LOCAL_SRC_FILES := \
EffectsMath.c.arm \
EffectEqualizer.cpp \
AudioBiquadFilter.cpp.arm \
@@ -42,21 +36,14 @@ LOCAL_SRC_FILES:= \
AudioShelvingFilter.cpp.arm \
AudioEqualizer.cpp.arm
-LOCAL_CFLAGS+= -O2
+LOCAL_CFLAGS := -O2
LOCAL_SHARED_LIBRARIES := \
- libcutils
+ libcutils \
+ libdl
LOCAL_MODULE_RELATIVE_PATH := soundfx
-LOCAL_MODULE:= libequalizertest
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_MODULE := libequalizertest
LOCAL_C_INCLUDES := \
$(call include-path-for, graphics corecg) \