diff options
| author | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
| commit | 22b41b9a232527d8c2b2a2b03e03005273529df7 (patch) | |
| tree | 1d5cd2c19c56dbc0d6a96cdfba61c269cf19781b /make/resources | |
| parent | 855fc43060fe788ce32b2daa396f6fe236c31ba8 (diff) | |
Bug 1417: Android: Adapt to GlueGen's 'aapt.signed' d8 usage and use manifest SDK API [min=21, target=28]
Also fix all make/scripts using Java11 as 'host compiler' and Java8 as target-rt-jar,
as well as adapt to GlueGen's new Android 'setenv-android-tools.sh' for new SDK/NDK as of 2019-12-10.
Diffstat (limited to 'make/resources')
| -rw-r--r-- | make/resources/android/AndroidManifest-jocl.xml | 2 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/make/resources/android/AndroidManifest-jocl.xml b/make/resources/android/AndroidManifest-jocl.xml index 7fbf04dd..031cd687 100644 --- a/make/resources/android/AndroidManifest-jocl.xml +++ b/make/resources/android/AndroidManifest-jocl.xml @@ -6,7 +6,7 @@ <uses-library android:name="com.jogamp.common" android:required="true" /> <uses-library android:name="com.jogamp.opengl" android:required="true" /> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <application android:icon="@drawable/icon" android:label="@string/app_name" diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index b09b081a..ba1b1200 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -8,7 +8,7 @@ <uses-library android:name="com.jogamp.opencl" android:required="true" /> <uses-library android:name="jogamp.android.launcher" android:required="true" /> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <application android:icon="@drawable/icon" android:label="@string/app_name" |