From b1066150e97b218f14d2cc9acfe66976fe7d6b56 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Wed, 8 Jun 2016 08:17:08 +0000 Subject: [PATCH] [android]: use static library in android rather than share library git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@898 6e48237b-75ef-9749-8fc9-41990f28c85a --- build/android/android.toolchain.cmake | 8 ++++---- osal/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/android/android.toolchain.cmake b/build/android/android.toolchain.cmake index e9ae53e3..7a39b3da 100644 --- a/build/android/android.toolchain.cmake +++ b/build/android/android.toolchain.cmake @@ -1301,10 +1301,10 @@ endif() # add crt object to executable link list for Android SDK build # ---------------------------------------------------------------------------- -set( ANDROID_CRT_BEGIN "${ANDROID_SYSROOT}/usr/lib/crtbegin_dynamic.o") -set( ANDROID_CRT_END "${ANDROID_SYSROOT}/usr/lib/crtend_android.o") -set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) -set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) +#set( ANDROID_CRT_BEGIN "${ANDROID_SYSROOT}/usr/lib/crtbegin_dynamic.o") +#set( ANDROID_CRT_END "${ANDROID_SYSROOT}/usr/lib/crtend_android.o") +#set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) +#set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_CRT_BEGIN} ${ANDROID_CRT_END}" ) # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt index a7cf8fc9..caa0084c 100644 --- a/osal/CMakeLists.txt +++ b/osal/CMakeLists.txt @@ -32,6 +32,7 @@ add_library(osal STATIC ) if(ANDROID) + add_definitions(-static) # in Android pthread is in libc, also need liblog target_link_libraries(osal log stdc++ m c ) else()