Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Switch submodule branch] Add arm64 support.

Browse source
This commit is contained in:
Ghislain MARY 2017-01-20 11:23:56 +01:00
parent 9456b074ad
commit 6f25c32d9f
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
prepare.py
View file

@ -65,6 +65,12 @@ class AndroidArmv7Target(AndroidTarget):
AndroidTarget.__init__(self, 'armv7') AndroidTarget.__init__(self, 'armv7')
class AndroidArm64Target(AndroidTarget):
def __init__(self):
AndroidTarget.__init__(self, 'arm64')
class AndroidX86Target(AndroidTarget): class AndroidX86Target(AndroidTarget):
def __init__(self): def __init__(self):
@ -76,6 +82,7 @@ class AndroidX86Target(AndroidTarget):
android_targets = { android_targets = {
'arm': AndroidArmTarget(), 'arm': AndroidArmTarget(),
'armv7': AndroidArmv7Target(), 'armv7': AndroidArmv7Target(),
'arm64': AndroidArm64Target(),
'x86': AndroidX86Target() 'x86': AndroidX86Target()
} }
@ -251,6 +258,25 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\ \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
\tfi \tfi
\trm -rf libs-debug/arm64-v8a
\trm -rf libs/arm64-v8a
\tif test -d "liblinphone-sdk/android-arm64"; then \\
\t\tmkdir -p libs-debug/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs-debug/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs-debug/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\
\t\tmkdir -p libs/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \\
\t\tsh WORK/android-arm64/strip.sh libs/arm64-v8a/*.so; \\
\tfi
\tif test -f "liblinphone-sdk/android-arm64/bin/gdbserver"; then \\
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs-debug/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs-debug/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
\tfi
\trm -rf libs-debug/x86 \trm -rf libs-debug/x86
\trm -rf libs/x86 \trm -rf libs/x86
\tif test -d "liblinphone-sdk/android-x86"; then \\ \tif test -d "liblinphone-sdk/android-x86"; then \\

8
submodules/externals/build/ffmpeg/CMakeLists.txt vendored
View file

@ -31,11 +31,11 @@ find_library(AVUTIL_LIBRARY avutil)
find_library(SWRESAMPLE_LIBRARY swresample) find_library(SWRESAMPLE_LIBRARY swresample)
find_library(SWSCALE_LIBRARY swscale) find_library(SWSCALE_LIBRARY swscale)
add_library(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} SHARED) add_library(ffmpeg-linphone-${NDK_ARCHITECTURE} SHARED)
target_link_libraries(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive") target_link_libraries(ffmpeg-linphone-${NDK_ARCHITECTURE} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive")
set_target_properties(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} PROPERTIES LINKER_LANGUAGE C) set_target_properties(ffmpeg-linphone-${NDK_ARCHITECTURE} PROPERTIES LINKER_LANGUAGE C)
install(TARGETS ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} install(TARGETS ffmpeg-linphone-${NDK_ARCHITECTURE}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}