Commit e5e662fc authored by Edward Wang's avatar Edward Wang Committed by Jean-Baptiste Kempf

Update Android code to support NDK 7

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent eb4fbd0c
......@@ -7,12 +7,20 @@ LOCAL_SRC_FILES := libvlcjni.c aout.c thumbnailer.c
LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
HAS_NDK_V7 = 1
ifeq ($(NO_NEON),)
ARCH=armeabi-v7a
else
ARCH=armeabi
endif
ifeq ($(HAS_NDK_V7),1)
CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libgnustl_static.a
else
CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libstdc++.a
endif
LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
$(VLC_MODULES) \
$(VLC_BUILD_DIR)/compat/.libs/libcompat.a \
......@@ -21,8 +29,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -lspeexdsp -ltheora \
-lavformat -lavcodec -lswscale -lavutil -lpostproc \
-lmpeg2 -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52 \
-lebml -lmatroska -ltag \
$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libstdc++.a
-lebml -lmatroska -ltag $(CPP_STATIC)
include $(BUILD_SHARED_LIBRARY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment