diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-12 16:28:30 -0800 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-02-12 16:28:30 -0800 |
| commit | d75baf2eee5ddd155009e7f0a79b175ae6026762 (patch) | |
| tree | 646f0315c6d6306bec0cf3371391e2b8ef12a97e /Android.mk | |
| parent | 7913073ddf11ca3dd7b0439998e1b17d443bb0ba (diff) | |
| download | external_tremolo-d75baf2eee5ddd155009e7f0a79b175ae6026762.zip external_tremolo-d75baf2eee5ddd155009e7f0a79b175ae6026762.tar.gz external_tremolo-d75baf2eee5ddd155009e7f0a79b175ae6026762.tar.bz2 | |
Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -1,4 +1,3 @@ -ifeq ($(TARGET_ARCH),arm) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -15,14 +14,21 @@ LOCAL_SRC_FILES = \ Tremolo/misc.c \ Tremolo/res012.c \ Tremolo/treminfo.c \ - Tremolo/vorbisfile.c \ + Tremolo/vorbisfile.c + +ifeq ($(TARGET_ARCH),arm) +LOCAL_SRC_FILES += \ Tremolo/bitwiseARM.s \ Tremolo/dpen.s \ Tremolo/floor1ARM.s \ Tremolo/mdctARM.s - -LOCAL_CFLAGS+= -O2 \ +LOCAL_CFLAGS += \ -D_ARM_ASSEM_ +else +LOCAL_CFLAGS += \ + -DONLY_C +endif +LOCAL_CFLAGS+= -O2 LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/Tremolo @@ -32,4 +38,3 @@ LOCAL_ARM_MODE := arm LOCAL_MODULE := libvorbisidec include $(BUILD_SHARED_LIBRARY) -endif |