From 768677b5b56a9cfea3accf4b7638d217eceade44 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 25 Dec 2019 05:37:38 +0100
Subject: Bug 1417 - Android: Jar Manifest joalversion-android can no more have
 'Name: <folder>' directives for apk

The 'Name <folder>' leads new apk to claim the missing resources (the folder actually)
and fails to install the apk.

Hence removed tagging the folders sealed.

See gluegen commit eb6dfabd7427a1836f6b1d2080422f98808ea0a4
---
 make/build.xml           | 22 ++++++++++++++++++++--
 make/joalversion-android | 19 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100755 make/joalversion-android

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index 75e32c2..adb7e0a 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -703,6 +703,19 @@
             </filterset>
         </copy>
 
+        <copy file="joalversion-android"
+          tofile="${build}/tempversion-android"
+          overwrite="true">
+            <filterset>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${joal.version}"/>
+                <filter token="SCM_BRANCH" value="${joal.build.branch}"/>
+                <filter token="SCM_COMMIT" value="${joal.build.commit}"/>
+                <filter token="BASEVERSION" value="${jogamp.version.base}" />
+                <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+            </filterset>
+        </copy>
+
         <!-- Build the jar excluding any build specific classes. -->
         <jar manifest="${build}/tempversion" destfile="${joal.jar}" filesonly="true">
             <fileset dir="${classes}">
@@ -710,8 +723,13 @@
                 <include name="jogamp/openal/**" />
             </fileset>
         </jar>
-        <copy file="${joal.jar}" tofile="${joal-android.jar}"/>
 
+        <jar manifest="${build}/tempversion-android" destfile="${joal-android.jar}" filesonly="true">
+            <fileset dir="${classes}">
+                <include name="com/jogamp/openal/**" />
+                <include name="jogamp/openal/**" />
+            </fileset>
+        </jar>
         <antcall target="android.package" inheritRefs="true" />
     </target>
 
@@ -725,7 +743,7 @@
             android.abi="${android.abi}"
             androidmanifest.path="resources/android/AndroidManifest-joal.xml"
             androidresources.path="resources/android/res-joal"
-            jarmanifest.path="${build}/tempversion"
+            jarmanifest.path="${build}/tempversion-android"
             version.code="${jogamp.version.int}"
             version.name="${jogamp.version}" />
     </target>
diff --git a/make/joalversion-android b/make/joalversion-android
new file mode 100755
index 0000000..91fcb0e
--- /dev/null
+++ b/make/joalversion-android
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: Java Bindings for OpenAL
+Specification-Title: Java Bindings for OpenAL API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Java Bindings for OpenAL Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: com.jogamp.openal
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
-- 
cgit v1.2.3