From c4f73b67ebbb554cde69b6f59ab377a38864df72 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 26 Dec 2019 04:50:21 +0100
Subject: Bug 1417 - Android: APK Manifest [min=21, target=28]; Adopt to
 GlueGen's 'aapt.signed' d8 usage

---
 make/build-test.xml                             | 8 +++++++-
 make/build.xml                                  | 6 +++++-
 make/resources/android/AndroidManifest-joal.xml | 2 +-
 make/resources/android/AndroidManifest-test.xml | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/make/build-test.xml b/make/build-test.xml
index e7a7416..ac317d0 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -166,7 +166,13 @@
             androidresources.path="resources/android/res-test"
             jarmanifest.path="${build.test}/manifest-test-android.mf"
             version.code="${jogamp.version.int}"
-            version.name="${jogamp.version}" />
+            version.name="${jogamp.version}">
+          <d8-classpaths>
+              <arg line="--classpath ${gluegen-rt-android.jar}"/> 
+              <arg line="--classpath ${junit.jar}"/> 
+              <arg line="--classpath ${build}/jar/joal.jar"/> 
+          </d8-classpaths>
+        </aapt.signed>
     </target>
 
     <target name="test.compile" depends="declare.common" unless="test.compile.skip">
diff --git a/make/build.xml b/make/build.xml
index adb7e0a..3cb747e 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -745,7 +745,11 @@
             androidresources.path="resources/android/res-joal"
             jarmanifest.path="${build}/tempversion-android"
             version.code="${jogamp.version.int}"
-            version.name="${jogamp.version}" />
+            version.name="${jogamp.version}">
+          <d8-classpaths>
+              <arg line="--classpath ${gluegen-rt.jar}"/> 
+          </d8-classpaths>
+        </aapt.signed>
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/resources/android/AndroidManifest-joal.xml b/make/resources/android/AndroidManifest-joal.xml
index a7b7f45..1a0aa70 100644
--- a/make/resources/android/AndroidManifest-joal.xml
+++ b/make/resources/android/AndroidManifest-joal.xml
@@ -3,7 +3,7 @@
       sharedUserId="com.jogamp.Community" 
       package="com.jogamp.openal">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
 
     <uses-library android:name="com.jogamp.common" android:required="true" />
 
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml
index d335c67..b433342 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -10,7 +10,7 @@
     <uses-library android:name="com.jogamp.openal" 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"
-- 
cgit v1.2.3