mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed android SDK dependency for native build.

Browse Source
This commit is contained in:
Armin Novak 2016-02-04 16:09:49 +01:00
parent 1f81556ed3
commit 8fdf59ae00
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/android-build-common.sh
View File

@ -8,10 +8,6 @@ if [ -z $NDK_TARGET ]; then
NDK_TARGET=21
fi
if [ -z $ANDROID_SDK ]; then
ANDROID_SDK="missing"
fi
if [ -z $ANDROID_NDK ]; then
ANDROID_NDK="missing"
fi
@ -36,8 +32,6 @@ CLEAN_BUILD_DIR=0
function common_help {
echo "$(BASHSOURCE[0]) supports the following arguments:"
echo " --sdk The base directory of your android SDK"
echo " ANDROID_SDK=$ANDROID_SDK"
echo " --ndk The base directory of your android NDK defa"
echo " ANDROID_NDK=$ANDROID_NDK"
echo " --arch A list of architectures to build"
@ -76,11 +70,6 @@ function common_parse_arguments {
shift
;;
--sdk)
ANDROID_SDK="$2"
shift
;;
--ndk)
ANDROID_NDK="$2"
shift
@ -129,12 +118,6 @@ function common_parse_arguments {
}
function common_check_requirements {
if [[ ! -d $ANDROID_SDK ]];
then
echo "export ANDROID_SDK to point to your SDK location."
exit 1
fi
if [[ ! -d $ANDROID_NDK ]];
then
echo "export ANDROID_NDK to point to your NDK location."

6
scripts/android-build-freerdp.sh
View File

@ -95,7 +95,7 @@ do
then
common_run bash $SCRIPT_PATH/android-build-jpeg.sh \
--src $BUILD_SRC/jpeg --dst $BUILD_DST \
--sdk $ANDROID_SDK --ndk $ANDROID_NDK \
--ndk $ANDROID_NDK \
--arch $ARCH \
--tag $JPEG_TAG
fi
@ -107,7 +107,7 @@ do
then
common_run bash $SCRIPT_PATH/android-build-openh264.sh \
--src $BUILD_SRC/openh264 --dst $BUILD_DST \
--sdk $ANDROID_SDK --ndk $ANDROID_NDK \
--ndk $ANDROID_NDK \
--arch $ARCH \
--tag $OPENH264_TAG
fi
@ -119,7 +119,7 @@ do
then
common_run bash $SCRIPT_PATH/android-build-openssl.sh \
--src $BUILD_SRC/openssl --dst $BUILD_DST \
--sdk $ANDROID_SDK --ndk $ANDROID_NDK \
--ndk $ANDROID_NDK \
--arch $ARCH \
--tag $OPENSSL_TAG
fi

4
scripts/android-build-openh264.sh
View File

@ -8,8 +8,8 @@ function build {
echo "Building architecture $1..."
BASE=$(pwd)
common_run cd $BUILD_SRC
PATH=$ANDROID_SDK/tools:$ANDROID_NDK:$PATH
MAKE="make PATH=$PATH OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j"
PATH=$ANDROID_NDK:$PATH
MAKE="make PATH=$PATH OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j libraries"
common_run git clean -xdf
common_run $MAKE
# Install creates a non optimal directory layout, fix that