Merge pull request #4369 from akallabeth/openh264_update

[android] Openh264 update scripts
This commit is contained in:
Bernhard Miklautz 2018-01-17 19:29:09 +01:00 committed by GitHub
commit 30ed6aaa26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -17,8 +17,8 @@ DEPS_ONLY=0
NDK_TARGET=14
JPEG_TAG=master
OPENH264_TAG=v1.6.0
OPENSSL_TAG=OpenSSL_1_1_0c
OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

View File

@ -17,8 +17,8 @@ DEPS_ONLY=0
NDK_TARGET=21
JPEG_TAG=master
OPENH264_TAG=v1.6.0
OPENSSL_TAG=OpenSSL_1_1_0c
OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

View File

@ -9,7 +9,7 @@ function build {
BASE=$(pwd)
common_run cd $BUILD_SRC
PATH=$ANDROID_NDK:$PATH
MAKE="make PATH=$PATH OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j libraries"
MAKE="make PATH=$PATH ENABLEPIC=Yes OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j libraries"
common_run git clean -xdf
common_run export QUIET_AR="$CCACHE "
common_run export QUIET_ASM="$CCACHE "

View File

@ -17,8 +17,8 @@ DEPS_ONLY=0
NDK_TARGET=21
JPEG_TAG=master
OPENH264_TAG=v1.6.0
OPENSSL_TAG=OpenSSL_1_1_0e
OPENH264_TAG=v1.7.0
OPENSSL_TAG=OpenSSL_1_1_0g
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs