summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/java.prf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features/java.prf')
-rw-r--r--mkspecs/features/java.prf21
1 files changed, 1 insertions, 20 deletions
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.