Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f09554 authored May 08, 2014 by Ying Wang

resolved conflicts for merge of cf79c7a5 to master

Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45

parents 96b292fd cf79c7a5

media/libeffects/downmix/Android.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -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)

media/libeffects/preprocessing/Android.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -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)