mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4570 from akallabeth/toolchain_fix 

android Toolchain fix
This commit is contained in:
David Fort 2018-05-02 12:09:55 +02:00 committed by GitHub
parent 31c804c349 927409cf81
commit 9381e18cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/Android/Studio/build.gradle
View File

@ -4,6 +4,19 @@ File file = new File('release.properties')
if (file.canRead()) { if (file.canRead()) {
properties.load(new FileInputStream(file)) properties.load(new FileInputStream(file))
} }
if (!hasProperty('RELEASE_STORE_FILE')) {
ext.RELEASE_STORE_FILE=''
}
if (!hasProperty('RELEASE_KEY_ALIAS')) {
ext.RELEASE_KEY_ALIAS=''
}
if (!hasProperty('RELEASE_KEY_ALIAS')) {
ext.RELEASE_KEY_ALIAS=''
}
if (!hasProperty('RELEASE_KEY_PASSWORD')) {
ext.RELEASE_KEY_PASSWORD=''
}
def getVersionName = { -> def getVersionName = { ->
def stdout = new ByteArrayOutputStream() def stdout = new ByteArrayOutputStream()

4
cmake/AndroidToolchain.cmake
View File

@ -1369,6 +1369,10 @@ if( ANDROID_COMPILER_IS_CLANG )
if( BUILD_WITH_ANDROID_NDK ) if( BUILD_WITH_ANDROID_NDK )
set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" ) set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" )
endif() endif()
else()
if( BUILD_WITH_ANDROID_NDK )
set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} --sysroot=${ANDROID_SYSROOT}" )
endif()
endif() endif()
# cache flags # cache flags

2
scripts/android-build-32.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=14
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.7.0 OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g OPENSSL_TAG=OpenSSL_1_1_0h
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

2
scripts/android-build-64.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=21
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.7.0 OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g OPENSSL_TAG=OpenSSL_1_1_0h
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

2
scripts/android-build.conf
View File

@ -18,7 +18,7 @@ NDK_TARGET=21
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.7.0 OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g OPENSSL_TAG=OpenSSL_1_1_0h
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs