diff options
| -rw-r--r-- | make/build-test.xml | 1 | ||||
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | make/jogamp-androidtasks.xml | 16 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-CompileTime.xml | 2 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-Runtime.xml | 2 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-Test.xml | 3 |
6 files changed, 17 insertions, 11 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 7836d99..24bef71 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -137,6 +137,7 @@ nativebuilddir="${build_t.lib}" nativebasename="test" androidmanifest.path="resources/android/AndroidManifest-Test.xml" + androidresources.path="resources/android/res" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> </target> diff --git a/make/build.xml b/make/build.xml index e5d5a15..b4f74a5 100644 --- a/make/build.xml +++ b/make/build.xml @@ -693,7 +693,7 @@ </copy> </target> - <target name="android.package" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid"> + <target name="android.package" depends="gluegen.cpptasks.detect.os,gluegen.build.check.java" if="isAndroid" unless="gluegen.build.skip.java" > <aapt.signed jarbuilddir="${build}" @@ -701,6 +701,7 @@ nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" androidmanifest.path="resources/android/AndroidManifest-Runtime.xml" + androidresources.path="resources/android/res" jarmanifest.path="${build}/Manifest-rt.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> @@ -711,6 +712,7 @@ nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" androidmanifest.path="resources/android/AndroidManifest-CompileTime.xml" + androidresources.path="resources/android/res" jarmanifest.path="${build}/Manifest.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index 15bf0dd..9521607 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -14,6 +14,7 @@ nativebuilddir="${gluegen.lib.dir}" // native library build location nativebasename="gluegen-rt" // native library base file name "*${nativebasename}*.${native.library.suffix}" androidmanifest.path="resources/android/AndroidManifest.xml" + androidresources.path="resources/android/res" jarmanifest.path="${build}/Manifest-rt.temp" // optional version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" @@ -36,6 +37,7 @@ <attribute name="nativebuilddir" /> <attribute name="nativebasename" /> <attribute name="androidmanifest.path" /> + <attribute name="androidresources.path" /> <attribute name="jarmanifest.path" default="/non.existing.manifest.file"/> <!-- attribute name="jarclasspathrefid" default="/non.existing.jarclasspathrefid"/--> <attribute name="version.code" /> @@ -47,7 +49,7 @@ <sequential> <var name="m.aapt.build.apk" unset="true"/> <var name="m.aapt.dex.file" unset="true"/> - <var name="m.aapt.resource.package.file.name" unset="true"/> + <var name="m.aapt.unsigned.package.file.name" unset="true"/> <var name="m.aapt.signed.file.name" unset="true"/> <var name="m.aapt.release.file.name" unset="true"/> <var name="m.aapt.keystore.file" unset="true"/> @@ -58,8 +60,8 @@ <property name="m.aapt.build.apk" value="@{jarbuilddir}/@{jarbasename}.apk.d" /> <property name="m.aapt.dex.file" location="${m.aapt.build.apk}/image/classes.dex" /> - <property name="m.aapt.resource.package.file.name" value="${m.aapt.build.apk}/@{jarbasename}.ap_" /> - <property name="m.aapt.signed.file.name" value="${m.aapt.build.apk}/@{jarbasename}-sign.ap_" /> + <property name="m.aapt.unsigned.package.file.name" value="@{jarbuilddir}/@{jarbasename}-unsigned.apk" /> + <property name="m.aapt.signed.file.name" value="${m.aapt.build.apk}/@{jarbasename}-signed-raw.apk" /> <property name="m.aapt.release.file.name" value="@{jarbuilddir}/@{jarbasename}.apk" /> <property name="m.aapt.java.encoding" value="UTF-8" /> @@ -93,7 +95,7 @@ <arg line="--debug-mode"/> <arg line="-f"/> <arg line="-S"/> - <arg line="resources/android/res"/> + <arg line="@{androidresources.path}"/> <arg line="-M"/> <arg line="${m.aapt.build.apk}/image/AndroidManifest.xml"/> <arg line="-I"/> @@ -140,7 +142,7 @@ <arg line="-f"/> <arg line="-S" /> - <arg value="resources/android/res"/> + <arg value="@{androidresources.path}"/> <arg line="-A" /> <arg value="${m.aapt.build.apk}/image/lib/assets"/> @@ -155,7 +157,7 @@ <arg value="@{version.name}"/> <arg line="-F" /> - <arg value="${m.aapt.resource.package.file.name}"/> + <arg value="${m.aapt.unsigned.package.file.name}"/> <arg line="${m.aapt.build.apk}/image/"/> </exec> @@ -182,7 +184,7 @@ <echo>aapt.signed @{jarbasename}: signing w/ key @{keystore.alias} @ ${m.aapt.keystore.file}</echo> <signjar - jar="${m.aapt.resource.package.file.name}" + jar="${m.aapt.unsigned.package.file.name}" signedjar="${m.aapt.signed.file.name}" keystore="${m.aapt.keystore.file}" alias="@{keystore.alias}" diff --git a/make/resources/android/AndroidManifest-CompileTime.xml b/make/resources/android/AndroidManifest-CompileTime.xml index f9a5600..331457b 100644 --- a/make/resources/android/AndroidManifest-CompileTime.xml +++ b/make/resources/android/AndroidManifest-CompileTime.xml @@ -3,7 +3,7 @@ sharedUserId="com.jogamp.Community" package="com.jogamp.gluegen"> - <uses-sdk android:minSdkVersion="8" /> + <uses-sdk android:minSdkVersion="9" /> <application android:icon="@drawable/icon" android:label="@string/app_name" diff --git a/make/resources/android/AndroidManifest-Runtime.xml b/make/resources/android/AndroidManifest-Runtime.xml index 7ad8304..04dfe33 100644 --- a/make/resources/android/AndroidManifest-Runtime.xml +++ b/make/resources/android/AndroidManifest-Runtime.xml @@ -3,7 +3,7 @@ sharedUserId="com.jogamp.Community" package="com.jogamp.common"> - <uses-sdk android:minSdkVersion="8" /> + <uses-sdk android:minSdkVersion="9" /> <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 c7c8f03..1b713be 100644 --- a/make/resources/android/AndroidManifest-Test.xml +++ b/make/resources/android/AndroidManifest-Test.xml @@ -3,7 +3,8 @@ sharedUserId="com.jogamp.Community" package="com.jogamp.gluegen.test"> - <uses-sdk android:minSdkVersion="8" /> + <uses-sdk android:minSdkVersion="9" /> + <uses-library android:name="com.jogamp.common" android:required="true" /> <application android:icon="@drawable/icon" android:label="@string/app_name" |