diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-05-21 07:46:51 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-06-18 09:52:42 +1000 |
| commit | 7b6cdbfc6edf32c1719f0702abe1ec0a2253b9e8 (patch) | |
| tree | fcc8ef2dd479d44367aea658a144d33d1192caf0 | |
| parent | 53282f34e6539717c459a466db62e84e0ec8c498 (diff) | |
[android] refactor target min and compile SDK to single cmake set variables
Provides a single location to set required values for android target SDK and minimum sdk
| -rw-r--r-- | cmake/platform/android/android.cmake | 5 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml.in | 4 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/build.gradle.in | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake index 7e3300426d..e41dc24e22 100644 --- a/cmake/platform/android/android.cmake +++ b/cmake/platform/android/android.cmake @@ -1,2 +1,7 @@ set(PLATFORM_REQUIRED_DEPS LibAndroidJNI OpenGLES EGL Zip) set(APP_RENDER_SYSTEM gles) + +# Store SDK compile version +set(TARGET_SDK 29) +# Minimum supported SDK version +set(TARGET_MINSDK 21) diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index c871d1c391..fbb807ff37 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -6,8 +6,8 @@ android:versionName="@APP_VERSION@"> <uses-sdk - android:minSdkVersion="21" - android:targetSdkVersion="29" /> + android:minSdkVersion="@TARGET_MINSDK@" + android:targetSdkVersion="@TARGET_SDK@" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.INTERNET" /> diff --git a/tools/android/packaging/xbmc/build.gradle.in b/tools/android/packaging/xbmc/build.gradle.in index a1f1a3ac74..97a1a9bb18 100644 --- a/tools/android/packaging/xbmc/build.gradle.in +++ b/tools/android/packaging/xbmc/build.gradle.in @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 + compileSdkVersion @TARGET_SDK@ defaultConfig { applicationId "@APP_PACKAGE@" - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion @TARGET_MINSDK@ + targetSdkVersion @TARGET_SDK@ versionCode @APP_VERSION_CODE_ANDROID@ versionName "@APP_VERSION@" } |