Fixed sporadic linking bug that was dependent on the order of files r…

…eturned by a find command.
bingshine · Jul 20, 2011 · 2498bde · 2498bde
1 parent 22605bb
commit 2498bde
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -2,7 +2,14 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE  := videokit
-FFMPEG_LIBS := $(shell find ffmpeg -name '*.a')
+#FFMPEG_LIBS := $(shell find ffmpeg -name '*.a')
+FFMPEG_LIBS := ffmpeg/libavdevice/libavdevice.a \
+ffmpeg/libavformat/libavformat.a \
+ffmpeg/libavcodec/libavcodec.a \
+ffmpeg/libavfilter/libavfilter.a \
+ffmpeg/libavutil/libavutil.a \
+ffmpeg/libswscale/libswscale.a \
+ffmpeg/libpostproc/libpostproc.a
 LOCAL_CFLAGS += -Iffmpeg -Ivideokit
 LOCAL_LDLIBS += -llog $(FFMPEG_LIBS) x264/libx264.a
 LOCAL_SRC_FILES := videokit/jni_interface.c