summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McNeil <sean.mcneil@windriver.com>2009-12-02 22:57:57 +0700
committerSean McNeil <sean.mcneil@windriver.com>2009-12-02 22:57:57 +0700
commitf7d341d367bafa683f1ed2faaf2d7335e810c57b (patch)
treeaed9411a98727335d3322926183341295b9f0374
parent7d7fc0e490064bd51f8fe43b397c7598504bff81 (diff)
downloadalsa-lib-eclair.tar.gz
Change to shared library as libaudio.so size has decreased.eclair
-rw-r--r--Android.mk7
-rw-r--r--src/alisp/alisp.c1
2 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 8bd4353..4a833a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libasound
+LOCAL_PRELINK_MODULE := false
LOCAL_ARM_MODE := arm
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
@@ -70,7 +71,9 @@ LOCAL_SRC_FILES := $(filter-out src/pcm/pcm_shm.c, $(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(filter-out src/pcm/scopes/level.c, $(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(filter-out src/shmarea.c, $(LOCAL_SRC_FILES))
-include $(BUILD_STATIC_LIBRARY)
+LOCAL_SHARED_LIBRARIES := \
+ libdl
-endif
+include $(BUILD_SHARED_LIBRARY)
+endif
diff --git a/src/alisp/alisp.c b/src/alisp/alisp.c
index 4ad1d09..0e6f549 100644
--- a/src/alisp/alisp.c
+++ b/src/alisp/alisp.c
@@ -1021,6 +1021,7 @@ static const char *obj_type_str(struct alisp_object * p)
case ALISP_OBJ_CONS: return "cons";
default: assert(0);
}
+ return NULL;
}
static void print_obj_lists(struct alisp_instance *instance, snd_output_t *out)