Commit 8eb5e2e3 authored by Ghislain MARY's avatar Ghislain MARY

Define position independent code option in the Android toolchain instead of the config.

parent c0919c94
......@@ -101,7 +101,6 @@ list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_MODULE_LINKER_FLAGS:STRING
CMAKE_MODULE_PATH:PATH
CMAKE_NO_BUILD_TYPE:BOOL
CMAKE_POSITION_INDEPENDENT_CODE:BOOL
CMAKE_PREFIX_PATH:STRING
CMAKE_PROGRAM_PATH:STRING
CMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH
......
......@@ -46,7 +46,6 @@ set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARE
# Global configuration
set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-linux-android")
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
set(CMAKE_INSTALL_RPATH "$ORIGIN")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armeabi" AND ENABLE_VIDEO)
message(STATUS "Disabling video for armv6")
......
......@@ -70,6 +70,7 @@ set(ANDROID_TOOLCHAIN_NM "${ANDROID_TOOLCHAIN_PREFIX}nm")
include(CMakeForceCompiler)
set(CMAKE_CROSSCOMPILING TRUE)
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
# Define name of the target system
set(CMAKE_SYSTEM_NAME "Linux")
......
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