Commit 5aa4c49a authored by Thomas Guillem's avatar Thomas Guillem

build: replace android-L by android-21

parent bbfb2814
...@@ -22,7 +22,7 @@ LIBVLC_LIBS = libvlcjni ...@@ -22,7 +22,7 @@ LIBVLC_LIBS = libvlcjni
ifneq ($(HAVE_64),1) ifneq ($(HAVE_64),1)
# Can't link with 32bits symbols. # Can't link with 32bits symbols.
# Not a problem since MediaCodec should work on 64bits devices (android-L) # Not a problem since MediaCodec should work on 64bits devices (android-21)
LIBVLC_LIBS += libiomx-ics libiomx-hc libiomx-gingerbread LIBVLC_LIBS += libiomx-ics libiomx-hc libiomx-gingerbread
endif endif
......
...@@ -70,7 +70,7 @@ case "$REL" in ...@@ -70,7 +70,7 @@ case "$REL" in
10*) 10*)
if [ "${HAVE_64}" = 1 ];then if [ "${HAVE_64}" = 1 ];then
GCCVER=4.9 GCCVER=4.9
ANDROID_API=android-L ANDROID_API=android-21
else else
GCCVER=4.8 GCCVER=4.8
ANDROID_API=android-9 ANDROID_API=android-9
...@@ -320,13 +320,13 @@ config_undef () ...@@ -320,13 +320,13 @@ config_undef ()
sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
} }
if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-L" ] ; then if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
# NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if # NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
# intel devices has nanf. Assume they don't have it. # intel devices has nanf. Assume they don't have it.
config_undef HAVE_NANF config_undef HAVE_NANF
fi fi
if [ ${ANDROID_API} = "android-L" ] ; then if [ ${ANDROID_API} = "android-21" ] ; then
# android-L has empty sys/shm.h headers that triggers shm detection but it # android-21 has empty sys/shm.h headers that triggers shm detection but it
# doesn't have any shm functions and/or symbols. */ # doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H config_undef HAVE_SYS_SHM_H
fi fi
......
...@@ -5,8 +5,8 @@ LOCAL_MODULE := libvlcjni ...@@ -5,8 +5,8 @@ LOCAL_MODULE := libvlcjni
LOCAL_SRC_FILES := libvlcjni.c libvlcjni-util.c libvlcjni-track.c libvlcjni-medialist.c aout.c vout.c libvlcjni-equalizer.c native_crash_handler.c LOCAL_SRC_FILES := libvlcjni.c libvlcjni-util.c libvlcjni-track.c libvlcjni-medialist.c aout.c vout.c libvlcjni-equalizer.c native_crash_handler.c
LOCAL_SRC_FILES += thumbnailer.c LOCAL_SRC_FILES += thumbnailer.c
ifneq ($(ANDROID_API),android-L) ifneq ($(ANDROID_API),android-21)
# compat functions not needed after android-L # compat functions not needed after android-21
LOCAL_SRC_FILES += pthread-condattr.c pthread-rwlocks.c pthread-once.c eventfd.c sem.c pipe2.c LOCAL_SRC_FILES += pthread-condattr.c pthread-rwlocks.c pthread-once.c eventfd.c sem.c pipe2.c
endif endif
LOCAL_SRC_FILES += wchar/wcpcpy.c LOCAL_SRC_FILES += wchar/wcpcpy.c
......
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