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

Android client support script fixes.

Browse Source
This commit is contained in:
Armin Novak 2016-08-18 10:01:12 +02:00
parent 161685b25c
commit 196386f59b
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
View File

@ -6,17 +6,6 @@
android:versionCode="3" android:versionCode="3"
android:versionName="e83f97b" > android:versionName="e83f97b" >
<uses-sdk
android:targetSdkVersion="21"
android:minSdkVersion="14"/>
<supports-screens
android:anyDensity="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true" />
<application android:name="com.freerdp.afreerdp.application.GlobalApp" <application android:name="com.freerdp.afreerdp.application.GlobalApp"
android:label="aFreeRDP" android:label="aFreeRDP"
android:icon="@drawable/icon_launcher_freerdp" > android:icon="@drawable/icon_launcher_freerdp" >

4
client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
View File

@ -6,10 +6,6 @@
android:versionCode="3" android:versionCode="3"
android:versionName="e83f97b" > android:versionName="e83f97b" >
<uses-sdk
android:targetSdkVersion="21"
android:minSdkVersion="14"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

@ -70,6 +70,11 @@ function common_parse_arguments {
shift shift
;; ;;
--target)
NDK_TARGET="$2"
shift
;;
--ndk) --ndk)
ANDROID_NDK="$2" ANDROID_NDK="$2"
shift shift

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

@ -80,7 +80,7 @@ fi
common_run mkdir -p $BUILD_SRC common_run mkdir -p $BUILD_SRC
CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \
-DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \ -DANDROID_NATIVE_API_LEVEL=android-${NDK_TARGET} \
-DCMAKE_TOOLCHAIN_FILE=$SRC_DIR/cmake/AndroidToolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE=$SRC_DIR/cmake/AndroidToolchain.cmake \
-DCMAKE_INSTALL_PREFIX=$BUILD_DST \ -DCMAKE_INSTALL_PREFIX=$BUILD_DST \
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
@ -98,6 +98,7 @@ do
--src $BUILD_SRC/jpeg --dst $BUILD_DST \ --src $BUILD_SRC/jpeg --dst $BUILD_DST \
--ndk $ANDROID_NDK \ --ndk $ANDROID_NDK \
--arch $ARCH \ --arch $ARCH \
--target $NDK_TARGET \
--tag $JPEG_TAG --tag $JPEG_TAG
fi fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_JPEG=ON" CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_JPEG=ON"
@ -110,6 +111,7 @@ do
--src $BUILD_SRC/openh264 --dst $BUILD_DST \ --src $BUILD_SRC/openh264 --dst $BUILD_DST \
--ndk $ANDROID_NDK \ --ndk $ANDROID_NDK \
--arch $ARCH \ --arch $ARCH \
--target $NDK_TARGET \
--tag $OPENH264_TAG --tag $OPENH264_TAG
fi fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=ON" CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=ON"
@ -122,6 +124,7 @@ do
--src $BUILD_SRC/openssl --dst $BUILD_DST \ --src $BUILD_SRC/openssl --dst $BUILD_DST \
--ndk $ANDROID_NDK \ --ndk $ANDROID_NDK \
--arch $ARCH \ --arch $ARCH \
--target $NDK_TARGET \
--tag $OPENSSL_TAG --tag $OPENSSL_TAG
fi fi
fi fi

4
scripts/android-build.conf
View File

@ -17,10 +17,10 @@ WITH_OPENH264=0
WITH_OPENSSL=1 WITH_OPENSSL=1
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
ANDROID_NATIVE_API_LEVEL=android-21 NDK_TARGET=21
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.5.0 OPENH264_TAG=v1.6.0
OPENSSL_TAG=OpenSSL_1_0_2h OPENSSL_TAG=OpenSSL_1_0_2h
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..