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

---
 make/build-test.xml                             | 18 +++++++++++++++++-
 make/build.xml                                  | 12 +++++++++++-
 make/resources/android/AndroidManifest-jogl.xml |  2 +-
 make/resources/android/AndroidManifest-test.xml |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 3a7048703..3270e32f1 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -211,7 +211,23 @@
             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 ${joal.jar}"/> 
+              <arg line="--classpath ${jogl-all.jar}"/> 
+              <arg line="--classpath ${jogl-all-android.jar}"/> 
+              <arg line="--classpath ${gluegen-test-util.jar}"/> 
+              <arg line="--classpath ${junit.jar}"/> 
+              <arg line="--classpath ${ant.jar}"/> 
+              <arg line="--classpath ${ant-junit.jar}"/> 
+              <arg line="--classpath ${ant-junit4.jar}"/> 
+              <arg line="--classpath ${semver.jar}"/> 
+              <arg line="--classpath ${swt.jar}"/> 
+              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
+              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
+          </d8-classpaths>
+        </aapt.signed>
     </target>
 
     <target name="test.compile.check" depends="declare.common">
diff --git a/make/build.xml b/make/build.xml
index 373c96455..2965df64e 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -212,7 +212,17 @@
             androidresources.path="resources/android/res-jogl"
             jarmanifest.path="${build.jogl}/manifest.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 ${joal.jar}"/> 
+              <arg line="--classpath ${jogl-all.jar}"/> 
+              <arg line="--classpath ${jogl-all-android.jar}"/> 
+              <arg line="--classpath ${swt.jar}"/> 
+              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
+              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
+          </d8-classpaths>
+        </aapt.signed>
     </target>
 
     <target name="one.dir.skip.check" depends="init,gluegen.cpptasks.detect.os">
diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml
index 76872b69e..54a097014 100644
--- a/make/resources/android/AndroidManifest-jogl.xml
+++ b/make/resources/android/AndroidManifest-jogl.xml
@@ -9,7 +9,7 @@
 
     <uses-library android:name="com.jogamp.common" 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 3238c2280..dc500e794 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -11,7 +11,7 @@
     <uses-library android:name="com.jogamp.opengl" 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