diff options
| author | Ying Wang <wangying@google.com> | 2014-05-08 13:48:00 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-08 13:48:00 -0700 |
| commit | 49f095546d047b52c5070229bbee0c3f27548256 (patch) | |
| tree | e8655eaaac3236025d96de19f86ad029aa5ed836 /media/libeffects | |
| parent | 96b292fd3c76f9af155ee6f7a8559258eeedc6fd (diff) | |
| parent | cf79c7a576837d8bccecc80612a1f6f30bb328a8 (diff) | |
| download | frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.zip frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.tar.gz frameworks_av-49f095546d047b52c5070229bbee0c3f27548256.tar.bz2 | |
resolved conflicts for merge of cf79c7a5 to master
Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/downmix/Android.mk | 6 | ||||
| -rw-r--r-- | media/libeffects/preprocessing/Android.mk | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/media/libeffects/downmix/Android.mk b/media/libeffects/downmix/Android.mk index 2bb6dbe..e0ca8af 100644 --- a/media/libeffects/downmix/Android.mk +++ b/media/libeffects/downmix/Android.mk @@ -15,16 +15,10 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_RELATIVE_PATH := soundfx -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif - LOCAL_C_INCLUDES := \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) -LOCAL_PRELINK_MODULE := false - LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/preprocessing/Android.mk b/media/libeffects/preprocessing/Android.mk index 9e8cb83..ea3c59d 100644 --- a/media/libeffects/preprocessing/Android.mk +++ b/media/libeffects/preprocessing/Android.mk @@ -24,12 +24,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ liblog -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_LDLIBS += -ldl -else LOCAL_SHARED_LIBRARIES += libdl -endif - LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) |