diff options
| author | Sven Gothel <[email protected]> | 2019-12-26 18:34:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-26 18:34:48 +0100 |
| commit | 023fff1af43a172d4c2a0e18fdbb78e6ba817cca (patch) | |
| tree | 79058997b00b981dfbe4b6411d21d4755c78c677 /make/build.xml | |
| parent | 22b41b9a232527d8c2b2a2b03e03005273529df7 (diff) | |
Bug 1417 - Android: Manifest*-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.
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index bb46cbf5..2b096cd1 100644 --- a/make/build.xml +++ b/make/build.xml @@ -594,6 +594,18 @@ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> + <copy file="joclversion-android" + tofile="${build}/tempversion-android" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jocl.version}"/> + <filter token="SCM_BRANCH" value="${jocl.build.branch}"/> + <filter token="SCM_COMMIT" value="${jocl.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="${jocl.jar}" filesonly="true"> @@ -607,7 +619,7 @@ </fileset> </jar> - <jar manifest="${build}/tempversion" destfile="${jocl-android.jar}" filesonly="true"> + <jar manifest="${build}/tempversion-android" destfile="${jocl-android.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/opencl/**" /> <include name="jogamp/opencl/**" /> @@ -640,7 +652,7 @@ android.abi="${android.abi}" androidmanifest.path="resources/android/AndroidManifest-jocl.xml" androidresources.path="resources/android/res-jocl" - jarmanifest.path="${build}/tempversion" + jarmanifest.path="${build}/tempversion-android" version.code="${jogamp.version.int}" version.name="${jogamp.version}"> <d8-classpaths> |