package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Android]: fix 32bit script error

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@612 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-04-22 02:50:20 +00:00
parent 19fd27ea1f
commit 2600979beb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/android.toolchain.cmake
View File

@@ -1310,7 +1310,7 @@ set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_CRT
# ----------------------------------------------------------------------------
# add libgcc.a to executable link list
# ----------------------------------------------------------------------------
set( ANDROID_LIB_GCC "${ANDROID_TOOLCHAIN_ROOT}/lib/gcc/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${ANDROID_COMPILER_VERSION}/${CMAKE_SYSTEM_PROCESSOR}/libgcc.a")
set( ANDROID_LIB_GCC "${ANDROID_TOOLCHAIN_ROOT}/lib/gcc/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${ANDROID_COMPILER_VERSION}/libgcc.a")
set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${ANDROID_LIB_GCC}" )
set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIB_GCC}" )

2
build/android/make-Android.bash
View File

@@ -7,7 +7,7 @@ else
ANDROID_NDK=~/work/android/ndk/android-ndk-r10d/
fi
PLATFORM=$ANDROID_NDK/platforms/android-17/arch-arm
PLATFORM=$ANDROID_NDK/platforms/android-21/arch-arm
cmake -DCMAKE_TOOLCHAIN_FILE=./android.toolchain.cmake \
-DCMAKE_BUILD_TYPE=Release \