diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/java.prf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 7815b5ef38..265ab11fea 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -2,17 +2,17 @@ TEMPLATE = lib android { isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT) isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT - isEmpty(API_VERSION) { - API_VERSION = $$(ANDROID_API_VERSION) - isEmpty(API_VERSION): API_VERSION = android-10 - } + + 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-10 isEmpty(BUILD_TOOLS_REVISION) { BUILD_TOOLS_REVISION = $$(ANDROID_BUILD_TOOLS_REVISION) isEmpty(BUILD_TOOLS_REVISION): BUILD_TOOLS_REVISION = 17.0.0 } - ANDROID_JAR_FILE = $$SDK_ROOT/platforms/$$API_VERSION/android.jar + ANDROID_JAR_FILE = $$SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { error("The Path $$ANDROID_JAR_FILE does not exist. Make sure the ANDROID_SDK_ROOT and ANDROID_API_VERSION environment variables are correctly set.") } |