Android client support script fixes.

diff --git a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
index 0d7915c..65d3db4 100644 (file)
--- a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
+++ b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
@@ -6,17 +6,6 @@
        android:versionCode="3"
        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"
                android:label="aFreeRDP"
                android:icon="@drawable/icon_launcher_freerdp" >

diff --git a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
index 08866ac..e0baac6 100644 (file)
--- a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
@@ -6,10 +6,6 @@
        android:versionCode="3"
        android:versionName="e83f97b" >
 
-       <uses-sdk
-               android:targetSdkVersion="21"
-               android:minSdkVersion="14"/>
-
        <uses-permission android:name="android.permission.INTERNET"/>
        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

diff --git a/scripts/android-build-common.sh b/scripts/android-build-common.sh
index 5a2bcfb..0945877 100644 (file)
--- a/scripts/android-build-common.sh
+++ b/scripts/android-build-common.sh
@@ -70,6 +70,11 @@ function common_parse_arguments {
             shift
             ;;
 
+                       --target)
+                       NDK_TARGET="$2"
+                       shift
+                       ;;
+
                        --ndk)
                        ANDROID_NDK="$2"
                        shift

diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
index ea51993..ba69da0 100755 (executable)
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@@ -80,7 +80,7 @@ fi
 common_run mkdir -p $BUILD_SRC
 
 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_INSTALL_PREFIX=$BUILD_DST \
        -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
@@ -98,6 +98,7 @@ do
                 --src $BUILD_SRC/jpeg --dst $BUILD_DST \
                 --ndk $ANDROID_NDK \
                 --arch $ARCH \
+               --target $NDK_TARGET \
                 --tag $JPEG_TAG
         fi
         CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_JPEG=ON"
@@ -110,6 +111,7 @@ do
                 --src $BUILD_SRC/openh264 --dst $BUILD_DST \
                 --ndk $ANDROID_NDK \
                 --arch $ARCH \
+               --target $NDK_TARGET \
                 --tag $OPENH264_TAG
         fi
         CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=ON"
@@ -122,6 +124,7 @@ do
                 --src $BUILD_SRC/openssl --dst $BUILD_DST \
                 --ndk $ANDROID_NDK \
                 --arch $ARCH \
+               --target $NDK_TARGET \
                 --tag $OPENSSL_TAG
         fi
     fi

diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 18d6d6d..82669b5 100644 (file)
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -17,10 +17,10 @@ WITH_OPENH264=0
 WITH_OPENSSL=1
 BUILD_DEPS=1
 DEPS_ONLY=0
-ANDROID_NATIVE_API_LEVEL=android-21
+NDK_TARGET=21
 
 JPEG_TAG=master
-OPENH264_TAG=v1.5.0
+OPENH264_TAG=v1.6.0
 OPENSSL_TAG=OpenSSL_1_0_2h
 
 SRC_DIR=$SCRIPT_PATH/..