From 2600979beb3edfadda525cf9fbbd3c95aa6fe4cf Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Fri, 22 Apr 2016 02:50:20 +0000 Subject: [PATCH] [Android]: fix 32bit script error git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@612 6e48237b-75ef-9749-8fc9-41990f28c85a --- build/android/android.toolchain.cmake | 2 +- build/android/make-Android.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/android/android.toolchain.cmake b/build/android/android.toolchain.cmake index e2fbc8dc..162a1fa3 100644 --- a/build/android/android.toolchain.cmake +++ b/build/android/android.toolchain.cmake @@ -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}" ) diff --git a/build/android/make-Android.bash b/build/android/make-Android.bash index 18fc5001..f3213b0f 100755 --- a/build/android/make-Android.bash +++ b/build/android/make-Android.bash @@ -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 \