diff options
| author | Sven Gothel <[email protected]> | 2023-01-20 05:26:45 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-20 05:26:45 +0100 |
| commit | 6a215f61d7aa882f4f02b031b015a678525c8642 (patch) | |
| tree | 34617e2d739dc9ba83eaa166c38d2ee8149db660 /make | |
| parent | 0ee21c35bff99abd2e7d34184003d9cf1ef80831 (diff) | |
jogamp-androidtasks: Drop fixed 'android.api.level.min', 'use android.api.level' (default: level 24 or 'N')
Diffstat (limited to 'make')
| -rw-r--r-- | make/jogamp-androidtasks.xml | 5 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 2 |
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" /> |