android: make target sdk version configurable

This commit is contained in:
Sebastian Krzyszkowiak 2017-08-19 01:25:02 +02:00
parent 417d34ef1a
commit b4d331fdcc
2 changed files with 2 additions and 1 deletions

View file

@ -4,7 +4,7 @@
android:versionCode="${LIBSUPERDERPY_RELEASE}" android:versionCode="${LIBSUPERDERPY_RELEASE}"
android:versionName="${LIBSUPERDERPY_VERSION}" android:versionName="${LIBSUPERDERPY_VERSION}"
android:installLocation="auto"> android:installLocation="auto">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="${ANDROID_TARGET_VERSION}" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" /> <uses-feature android:glEsVersion="0x00020000" android:required="true" />
<application android:label="@string/app_name" android:debuggable="${LIBSUPERDERPY_ANDROID_DEBUGGABLE}" android:icon="@mipmap/${LIBSUPERDERPY_GAMENAME}"> <application android:label="@string/app_name" android:debuggable="${LIBSUPERDERPY_ANDROID_DEBUGGABLE}" android:icon="@mipmap/${LIBSUPERDERPY_GAMENAME}">
<activity android:name="net.dosowisko.${LIBSUPERDERPY_GAMENAME}.SuperDerpyActivity" <activity android:name="net.dosowisko.${LIBSUPERDERPY_GAMENAME}.SuperDerpyActivity"

View file

@ -130,6 +130,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
if(ANDROID) if(ANDROID)
set(ANDROID_TARGET "android-23" CACHE STRING "What Android target to compile for.") set(ANDROID_TARGET "android-23" CACHE STRING "What Android target to compile for.")
STRING(REGEX REPLACE "^android-" "" ANDROID_TARGET_VERSION ${ANDROID_TARGET})
# The android tool on Windows is a batch file wrapper, which cannot be # The android tool on Windows is a batch file wrapper, which cannot be
# started by MSYS shell directly. We invoke it via cmd.exe instead. # started by MSYS shell directly. We invoke it via cmd.exe instead.