aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/jogamp-androidtasks.xml5
-rwxr-xr-xmake/jogamp-env.xml2
2 files changed, 3 insertions, 4 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index ba90a0c..bb9b935 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -181,7 +181,7 @@
<!-- exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true">
<arg line="- -dex"/>
<arg line="- -output=${m.aapt.dex.file}"/>
- <arg line="- -min-sdk-version=${android.api.level.min}"/>
+ <arg line="- -min-sdk-version=${android.api.level}"/>
<arg line="@{jarbuilddir}/@{jarbasename}.jar"/>
<arg line="${m.aapt.build.apk}/temp/classes"/>
</exec -->
@@ -192,7 +192,8 @@
<arg line="--classpath ${target.rt.jar}"/>
<d8-classpaths/>
- <arg line="--min-api ${android.api.level.min}"/>
+ <arg line="--min-api ${android.api.level}"/>
+
<arg line="--release"/>
<!-- arg line="- -debug"/ -->
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index ac807d2..c3946b0 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -202,8 +202,6 @@
</not>
</condition>
- <property name="android.api.level.min" value="21" />
-
<condition property="android.api.level" value="${env.ANDROID_API_LEVEL}" else="24">
<not>
<equals arg1="${env.ANDROID_API_LEVEL}" arg2="$${env.ANDROID_API_LEVEL}" casesensitive="true" />