From ca57d1cc89d65dfbd59c749c5736574cd08c7bd3 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 23 Jul 2010 00:19:11 -0700 Subject: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call. Addional changes: - Fixed simulator build - Use effect interface UUIDs from OpenSL ES includes when available - Added cleanspec rules to remove now obsolete test effect libraries - Fixed bug in AudioEffect JNI setParameter function. Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b --- media/libeffects/lvm/wrapper/Android.mk | 66 ++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 30 deletions(-) (limited to 'media/libeffects/lvm/wrapper/Android.mk') diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk index 4ebc443..7855dcd 100644 --- a/media/libeffects/lvm/wrapper/Android.mk +++ b/media/libeffects/lvm/wrapper/Android.mk @@ -1,30 +1,36 @@ -LOCAL_PATH:= $(call my-dir) - -# music bundle wrapper -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -LOCAL_SRC_FILES:= \ - Bundle/EffectBundle.cpp - -LOCAL_MODULE:= libbundlewrapper - -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx - -LOCAL_PRELINK_MODULE := false - -LOCAL_STATIC_LIBRARIES += libmusicbundle - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/Bundle \ - $(LOCAL_PATH)/../lib/Common/lib/ \ - $(LOCAL_PATH)/../lib/Bundle/lib/ - - -include $(BUILD_SHARED_LIBRARY) +LOCAL_PATH:= $(call my-dir) + +# music bundle wrapper +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +LOCAL_SRC_FILES:= \ + Bundle/EffectBundle.cpp + +LOCAL_MODULE:= libbundlewrapper + +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx + +LOCAL_PRELINK_MODULE := false + +LOCAL_STATIC_LIBRARIES += libmusicbundle + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + +ifeq ($(TARGET_SIMULATOR),true) +LOCAL_LDLIBS += -ldl +else +LOCAL_SHARED_LIBRARIES += libdl +endif + + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/Bundle \ + $(LOCAL_PATH)/../lib/Common/lib/ \ + $(LOCAL_PATH)/../lib/Bundle/lib/ + + +include $(BUILD_SHARED_LIBRARY) -- cgit v1.1