The_Great_Archive/libretroshare
1
0
Fork 0
mirror of https://github.com/RetroShare/libretroshare.git synced 2026-09-12 19:50:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Android pass build type Gradle > Toolchain > CMake

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2022-04-03 19:08:12 +02:00
parent 4a414d1db6
commit e2b188b5e9
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -199,6 +199,7 @@ ext.buildLibretroshareNativeLib =
environment "ANDROID_PLATFORM_VER", pApiLevel
environment "ANDROID_NDK_ARCH", toolchainArch
environment "RS_EXTRA_CMAKE_OPTS", getRsExtraCmakeOpts()
environment "TOOLCHAIN_BUILD_TYPE", pBuildType
commandLine toolChainScriptPath
}
}
@ -212,6 +213,7 @@ ext.buildLibretroshareNativeLib =
environment "ANDROID_PLATFORM_VER", pApiLevel
environment "ANDROID_NDK_ARCH", toolchainArch
environment "RS_EXTRA_CMAKE_OPTS", getRsExtraCmakeOpts()
environment "TOOLCHAIN_BUILD_TYPE", pBuildType
commandLine toolChainScriptPath, 'build_libretroshare'
}
}

7
misc/Android/prepare-toolchain-clang.sh
View File

@ -106,6 +106,8 @@ define_default_value REPORT_DIR "$(pwd)/$(basename ${NATIVE_LIBS_TOOLCHAIN_PATH}
define_default_value RS_SRC_DIR "$(realpath $(dirname $BASH_SOURCE)/../../)"
define_default_value RS_EXTRA_CMAKE_OPTS ""
# Debug or Release we should give support at least at those two builds type supported by CMake
define_default_value TOOLCHAIN_BUILD_TYPE ""
cArch=""
eABI=""
@ -206,8 +208,13 @@ function andro_cmake()
esac
_hi="$HOST_IGNORE_PREFIX"
cmakeBuildType=""
[ "$TOOLCHAIN_BUILD_TYPE" == "" ] ||
cmakeBuildType="-DCMAKE_BUILD_TYPE=$TOOLCHAIN_BUILD_TYPE"
cmake \
$cmakeBuildType \
-DCMAKE_SYSTEM_PROCESSOR=$cmakeProc \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DCMAKE_PREFIX_PATH="${PREFIX}" \