diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2016-04-22 16:35:02 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2016-04-25 07:41:54 +0000 |
| commit | 3010c387132a54f81147d5b2c17d96b27f49fe0f (patch) | |
| tree | 29a0d9d425d22a9c2c266cfd53111d5c53a4cb01 /mkspecs/features | |
| parent | 7ba9863e32615549f883db98371d520b5488c9a1 (diff) | |
Android: Make SDK detection its own qmake feature
To allow reusing the logic which detects the appropriate
Android SDK version to use for building the Java code,
this is now separated into its own .prf file. This is
required by Qt Purchasing to avoid duplicating the logic
there.
Change-Id: Ief5f5e70dab79751ef9e5a9c4a019bfda686cd09
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 21 | ||||
| -rw-r--r-- | mkspecs/features/java.prf | 21 |
2 files changed, 22 insertions, 20 deletions
diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf new file mode 100644 index 0000000000..eee7ac2d5d --- /dev/null +++ b/mkspecs/features/android/sdk.prf @@ -0,0 +1,21 @@ +API_VERSION_TO_USE = $$(ANDROID_API_VERSION) +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-16 + +ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar +!exists($$ANDROID_JAR_FILE) { + ANDROID_API_VERSION = $$section(API_VERSION_TO_USE, -, 1, 1) # Get version number from android-XY to ensure numeric comparison + ANDROID_API_VERSIONS = $$files($$ANDROID_SDK_ROOT/platforms/*) + for (VERSION, ANDROID_API_VERSIONS) { + BASENAME = $$basename(VERSION) + BASENAME = $$section(BASENAME, -, 1, 1) + greaterThan(BASENAME, $$ANDROID_API_VERSION): ANDROID_API_VERSION = $$BASENAME + } + API_VERSION_TO_USE = android-$$ANDROID_API_VERSION + ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar +} +!exists($$ANDROID_JAR_FILE) { + error("No suitable Android SDK platform found. Minimum version is $${API_VERSION_TO_USE}.") +} +JAVACLASSPATH += $$ANDROID_JAR_FILE + diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 6b9bbd3409..0f0b991f0a 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -1,25 +1,6 @@ TEMPLATE = lib android { - API_VERSION_TO_USE = $$(ANDROID_API_VERSION) - isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION - isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-16 - - ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar - !exists($$ANDROID_JAR_FILE) { - ANDROID_API_VERSION = $$section(API_VERSION_TO_USE, -, 1, 1) # Get version number from android-XY to ensure numeric comparison - ANDROID_API_VERSIONS = $$files($$ANDROID_SDK_ROOT/platforms/*) - for (VERSION, ANDROID_API_VERSIONS) { - BASENAME = $$basename(VERSION) - BASENAME = $$section(BASENAME, -, 1, 1) - greaterThan(BASENAME, $$ANDROID_API_VERSION): ANDROID_API_VERSION = $$BASENAME - } - API_VERSION_TO_USE = android-$$ANDROID_API_VERSION - ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar - } - !exists($$ANDROID_JAR_FILE) { - error("No suitable Android SDK platform found. Minimum version is $${API_VERSION_TO_USE}.") - } - JAVACLASSPATH += $$ANDROID_JAR_FILE + load(sdk) # FIXME: This is a hack to work around some hardcoded values in the android.prf. The # android.prf should be fixed and this should be removed. |