aboutsummaryrefslogtreecommitdiffstats
path: root/make/lib
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-07-28 04:24:54 +0200
committerSven Gothel <[email protected]>2011-07-28 04:24:54 +0200
commit2d672b1c5f237ccb911b9106308c0dc1977530b0 (patch)
tree3e7f66d032c7aab0dfadb663a2fb60381bb6eece /make/lib
parent445521018f49305cb3c09a4f2dcf0e9be8bc5a46 (diff)
Fix android build/unit-test ; Generalize aapt packaging (macro) ; Use jogamp icons
make/scripts/make.gluegen.all.android-armv7-cross.sh - make Rami and me happy :) - 3 default locations plus recognize user provided android toolkit path - fixes using ant targets as arguments make/jogamp-androidtasks.xml - macro aapt.signed: create signed apk file from jar - incl. adding native libraries - see macro doc. adding generic jogamp icons/images
Diffstat (limited to 'make/lib')
-rw-r--r--make/lib/android/AndroidManifest.xml4
-rw-r--r--make/lib/res/jogamp_logo_final_346x70pel.pngbin0 -> 8946 bytes
-rw-r--r--make/lib/res/jogamp_symbol_final_135x135pel.pngbin0 -> 5492 bytes
3 files changed, 1 insertions, 3 deletions
diff --git a/make/lib/android/AndroidManifest.xml b/make/lib/android/AndroidManifest.xml
index 7ddeac8..121a876 100644
--- a/make/lib/android/AndroidManifest.xml
+++ b/make/lib/android/AndroidManifest.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.jogamp.gluegen"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.jogamp.gluegen">
<uses-sdk android:minSdkVersion="8" />
<application android:icon="@drawable/icon" android:label="@string/app_name">
diff --git a/make/lib/res/jogamp_logo_final_346x70pel.png b/make/lib/res/jogamp_logo_final_346x70pel.png
new file mode 100644
index 0000000..935c4c0
--- /dev/null
+++ b/make/lib/res/jogamp_logo_final_346x70pel.png
Binary files differ
diff --git a/make/lib/res/jogamp_symbol_final_135x135pel.png b/make/lib/res/jogamp_symbol_final_135x135pel.png
new file mode 100644
index 0000000..a097108
--- /dev/null
+++ b/make/lib/res/jogamp_symbol_final_135x135pel.png
Binary files differ