diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-12 20:08:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 20:08:55 +0000 |
| commit | e10615e7f8749de887c8d25579398ad9e4094077 (patch) | |
| tree | 4d3490f00ecea3650ff483128583ee984696cda8 | |
| parent | d7986933bcf0b327bc260312b0ff0f83431a158b (diff) | |
| parent | 6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7 (diff) | |
| download | frameworks_av-e10615e7f8749de887c8d25579398ad9e4094077.zip frameworks_av-e10615e7f8749de887c8d25579398ad9e4094077.tar.gz frameworks_av-e10615e7f8749de887c8d25579398ad9e4094077.tar.bz2 | |
am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"
* commit '6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7':
Remove obsolete TARGET_SIMULATOR checks
| -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) \ |