diff options
| author | Sven Gothel <[email protected]> | 2012-05-04 15:30:30 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-04 15:30:30 +0200 |
| commit | 5ec33e91296992ff14b6b3cf471ce443ff16897c (patch) | |
| tree | e8f13d3c626a15ad0ce0ae72e7c6119e49d57e3f | |
| parent | 4cdda8f3d5bf219a92adffd90e72c399283d50e3 (diff) | |
Android: aapt no debug, gluegen: proper version.code and launcher manifest
| -rw-r--r-- | make/build.xml | 8 | ||||
| -rw-r--r-- | make/jogamp-androidtasks.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml index 96d45bf..30bebf5 100644 --- a/make/build.xml +++ b/make/build.xml @@ -70,8 +70,8 @@ </exec> <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> - <!-- This is the version of GlueGen you are building --> - <property name="gluegen_int_version" value="4"/> + <!-- This is the version of GlueGen you are building xxyyzzz, xx=API yy screen-from-to zzz app-version--> + <property name="gluegen_int_version" value="0914008"/> <property name="gluegen_base_version" value="2.0"/> <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" /> <property name="gluegen.version.plus" value="${gluegen_base_version}-${gluegen.build.branch}-b${gluegen.build.number}-${version.timestamp}" /> @@ -790,10 +790,10 @@ jarbasename="jogamp.android-launcher" nativebuilddir="${build}" nativebasename="non-existing" - android.abi="${android.abi}" + android.abi="generic" androidmanifest.path="resources/android/AndroidManifest-Launcher.xml" androidresources.path="resources/android/res" - jarmanifest.path="${build}/Manifest-rt.temp" + jarmanifest.path="${build}//Manifest-android-launcher.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index 5c68e0e..64becda 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -101,7 +101,7 @@ <exec dir="." executable="aapt" logError="true" failonerror="true" failifexecutionfails="true"> <arg line="package"/> <!-- arg line="-v"/ --> - <arg line="--debug-mode"/> + <!-- arg line=" - - debug-mode"/ --> <arg line="-f"/> <arg line="-S"/> <arg line="@{androidresources.path}"/> @@ -118,7 +118,7 @@ source="${target.sourcelevel}" target="${target.targetlevel}" bootclasspath="${target.rt.jar}" - debug="true" extdirs="" + debug="false" extdirs="" destdir="${m.aapt.build.apk}/image/lib/classes" verbose="true"> <src path="${m.aapt.build.apk}/image/lib/src" /> @@ -148,8 +148,8 @@ <echo>aapt.signed @{jarbasename}: packaging</echo> <exec dir="." executable="aapt" logError="true" failonerror="true" failifexecutionfails="true"> <arg line="package"/> - <!-- arg line="-v"/ --> - <arg line="--debug-mode"/> + <!--arg line="-v"/--> + <!-- arg line=" - - debug-mode"/ --> <arg line="-f"/> <arg line="-S" /> |