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

Commit 61636c24 authored Jul 19, 2010 by Andy McFadden Committed by Android (Google) Code Review Jul 19, 2010

Merge "Fix sim-eng build."

parents e8466b3f d84f9863

media/libeffects/lvm/wrapper/Android.mk

+7 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,13 @@ LOCAL_PRELINK_MODULE := false
		LOCAL_STATIC_LIBRARIES += libmusicbundle

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libdl
		libcutils

		ifeq ($(TARGET_SIMULATOR),true)
		LOCAL_LDLIBS += -ldl
		else
		LOCAL_SHARED_LIBRARIES += libdl
		endif

		LOCAL_C_INCLUDES += \
		$(LOCAL_PATH)/Bundle \

media/libeffects/visualizer/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE:= libvisualizer

		ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
		LOCAL_LDLIBS += -ldlS
		LOCAL_LDLIBS += -ldl
		endif

		ifneq ($(TARGET_SIMULATOR),true)